From 5ea0c0e2bee14faa5d4516a527ed7c87ff3fb790 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 16 May 2013 09:11:15 -0700
Subject: [PATCH] Cleaned up some simple hacking/pyflakes errors.

There are set of trivial changes that involved missing imports or unused
code. No functional changes should be evident.

Change-Id: If020e33674627845ea78192382bdf8977b442931
---
 bin/heat-watch                            |  1 -
 heat/api/openstack/v1/util.py             | 16 ----------------
 heat/cfn_client/boto_client.py            |  2 ++
 heat/cfn_client/boto_client_cloudwatch.py |  2 ++
 heat/common/heat_keystoneclient.py        |  2 ++
 heat/tests/test_validate.py               |  1 -
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/bin/heat-watch b/bin/heat-watch
index e1167f5e8..152b98f9f 100755
--- a/bin/heat-watch
+++ b/bin/heat-watch
@@ -42,7 +42,6 @@ gettext.install('heat', unicode=1)
 
 from heat.cfn_client import boto_client_cloudwatch as heat_client
 from heat.version import version_info as version
-from heat.common import config
 from heat.common import exception
 from heat.cfn_client import utils
 
diff --git a/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py
index f3aebc1f5..fd1816438 100644
--- a/heat/api/openstack/v1/util.py
+++ b/heat/api/openstack/v1/util.py
@@ -48,22 +48,6 @@ def identified_stack(handler):
     return handle_stack_method
 
 
-def identified_resource(handler):
-    '''
-    Decorator for a handler method that passes a resource identifier in place
-    of the various path components.
-    '''
-    @identified_stack
-    @wraps(handler)
-    def handle_stack_method(controller, stack_identity,
-                            resource_name, **kwargs):
-        resource_identity = identifier.ResourceIdentifier(stack_identity,
-                                                          resource_name)
-        return handler(controller, req, dict(resource_identity), **kwargs)
-
-    return handle_stack_method
-
-
 def make_url(req, identity):
     '''Return the URL for the supplied identity dictionary.'''
     try:
diff --git a/heat/cfn_client/boto_client.py b/heat/cfn_client/boto_client.py
index a31e853d1..6229d33a1 100644
--- a/heat/cfn_client/boto_client.py
+++ b/heat/cfn_client/boto_client.py
@@ -17,6 +17,8 @@
 Client implementation based on the boto AWS client library
 """
 
+import sys
+
 from heat.openstack.common import log as logging
 logger = logging.getLogger(__name__)
 
diff --git a/heat/cfn_client/boto_client_cloudwatch.py b/heat/cfn_client/boto_client_cloudwatch.py
index 111fca02a..98a14c468 100644
--- a/heat/cfn_client/boto_client_cloudwatch.py
+++ b/heat/cfn_client/boto_client_cloudwatch.py
@@ -17,6 +17,8 @@
 Client implementation based on the boto AWS client library
 """
 
+import sys
+
 from heat.openstack.common import log as logging
 logger = logging.getLogger(__name__)
 
diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py
index f90b341da..2e0228b34 100644
--- a/heat/common/heat_keystoneclient.py
+++ b/heat/common/heat_keystoneclient.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import exception
+
 import eventlet
 from keystoneclient.v2_0 import client as kc
 from oslo.config import cfg
diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 2c357b8eb..019a1ac95 100644
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -19,7 +19,6 @@ from heat.common import exception
 from heat.common import template_format
 from heat.engine import resources
 from heat.engine.resources import instance as instances
-from heat.engine import resources
 from heat.engine import service
 from heat.openstack.common.importutils import try_import
 import heat.db.api as db_api