From: Angus Salkeld <asalkeld@redhat.com>
Date: Mon, 19 Nov 2012 04:08:53 +0000 (+1100)
Subject: Remove unused statements/local assignments
X-Git-Tag: 2014.1~1197
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ab302c9ed8be1753d1e41a593eeabee5e3fffd16;p=openstack-build%2Fheat-build.git

Remove unused statements/local assignments

Change-Id: Iabc1932ef4f851567c30719de127e1165f23dd90
---

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 552907b6..630dab26 100644
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -118,8 +118,6 @@ class StackController(object):
             return self._stackid_format(result)
 
         con = req.context
-        parms = dict(req.params)
-
         try:
             stack_list = self.engine_rpcapi.list_stacks(con)
         except rpc_common.RemoteError as ex:
@@ -198,8 +196,6 @@ class StackController(object):
             return self._stackid_format(result)
 
         con = req.context
-        parms = dict(req.params)
-
         # If no StackName parameter is passed, we pass None into the engine
         # this returns results for all stacks (visible to this user), which
         # is the behavior described in the AWS DescribeStacks API docs
@@ -350,9 +346,6 @@ class StackController(object):
         """
 
         con = req.context
-        parms = dict(req.params)
-
-        logger.info('get_template')
         try:
             identity = self._get_identity(con, req.params['StackName'])
             templ = self.engine_rpcapi.get_template(con, identity)
@@ -381,8 +374,6 @@ class StackController(object):
         """
 
         con = req.context
-        parms = dict(req.params)
-
         try:
             templ = self._get_template(req)
         except socket.gaierror:
@@ -411,8 +402,6 @@ class StackController(object):
         Deletes the specified stack
         """
         con = req.context
-        parms = dict(req.params)
-
         try:
             identity = self._get_identity(con, req.params['StackName'])
             res = self.engine_rpcapi.delete_stack(con, identity, cast=False)
@@ -454,8 +443,6 @@ class StackController(object):
             return self._stackid_format(result)
 
         con = req.context
-        parms = dict(req.params)
-
         stack_name = req.params.get('StackName', None)
         try:
             identity = stack_name and self._get_identity(con, stack_name)
diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py
index ac6f3504..d008f449 100644
--- a/heat/api/cloudwatch/watch.py
+++ b/heat/api/cloudwatch/watch.py
@@ -270,7 +270,7 @@ class WatchController(object):
                     'Dimensions': dimensions}}
 
         try:
-            res = self.engine_rpcapi.create_watch_data(con, watch_name, data)
+            self.engine_rpcapi.create_watch_data(con, watch_name, data)
         except rpc_common.RemoteError as ex:
             return exception.map_remote_error(ex)
 
@@ -310,8 +310,8 @@ class WatchController(object):
 
         logger.debug("setting %s to %s" % (name, state_map[state]))
         try:
-            ret = self.engine_rpcapi.set_watch_state(con, watch_name=name,
-                                                       state=state_map[state])
+            self.engine_rpcapi.set_watch_state(con, watch_name=name,
+                                               state=state_map[state])
         except rpc_common.RemoteError as ex:
             return exception.map_remote_error(ex)
 
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index dbc6a73a..8f896287 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -493,7 +493,6 @@ class XMLResponseSerializer(object):
         # Assumption : root node is dict with single key
         root = data.keys()[0]
         eltree = etree.Element(root)
-        doc = etree.ElementTree(eltree)
         self.object_to_element(data.get(root), eltree)
         response = etree.tostring(eltree)
         logging.debug("XML response : %s" % response)
diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 83642503..0d2f15f7 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -293,7 +293,6 @@ class Instance(resource.Resource):
             return
         else:
             keypairs = self.nova().keypairs.list()
-            valid_key = False
             for k in keypairs:
                 if k.name == key_name:
                     return