Get rid of unused imports

This cruft just tends to build up over time...

Change-Id: I61fd067b431aaa57164c7ff781c9cc8bab04bd4b
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/bin/heat-cfn b/bin/heat-cfn
index 30deff66609e2cb2b08d186fd3865e42e8b8f769..7887ee4d73fff9d6fe091b8d2a4854e0185380ae 100755 (executable)
--- a/bin/heat-cfn
+++ b/bin/heat-cfn
@@ -26,7 +26,6 @@ import os
 import os.path
 import sys
 import time
-import json
 import logging
 
 import httplib

diff --git a/bin/heat-watch b/bin/heat-watch
index a5b185fa5a5e8e6b8ede5ac4aa796c825f7c941e..b2c4280ff0879f29defbb5a68f801172572959cf 100755 (executable)
--- a/bin/heat-watch
+++ b/bin/heat-watch
@@ -26,10 +26,8 @@ import os
 import os.path
 import sys
 import time
-import json
 import logging
 
-from urlparse import urlparse
 # If ../heat/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),

diff --git a/heat/api/cfn/v1/waitcondition.py b/heat/api/cfn/v1/waitcondition.py
index 3d4d9215b81cdd024b91bda25385f76c98c238c5..66260224e199b032d22a5ba958f23b7fccda553b 100644 (file)
--- a/heat/api/cfn/v1/waitcondition.py
+++ b/heat/api/cfn/v1/waitcondition.py
@@ -13,12 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from webob.exc import Response
-
 from heat.common import wsgi
 from heat.common import context
 from heat.rpc import client as rpc_client
-from heat.openstack.common import rpc
 from heat.common import identifier
 from heat.api.aws import exception
 import heat.openstack.common.rpc.common as rpc_common

diff --git a/heat/cfn_client/boto_client.py b/heat/cfn_client/boto_client.py
index 9a61111e70308f6361d25093d012919bbca42703..b08d74a8bbdec0c96f65531dd87084e7f689fe76 100644 (file)
--- a/heat/cfn_client/boto_client.py
+++ b/heat/cfn_client/boto_client.py
@@ -21,7 +21,6 @@ from heat.openstack.common import log as logging
 logger = logging.getLogger(__name__)
 
 from boto.cloudformation import CloudFormationConnection
-import json
 
 
 class BotoClient(CloudFormationConnection):

diff --git a/heat/cfn_client/client.py b/heat/cfn_client/client.py
index 68126536c66240e5b85365eda9d5fca3e0592476..c00db9c51bd74c36e4809f869f5704ea74c186bb 100644 (file)
--- a/heat/cfn_client/client.py
+++ b/heat/cfn_client/client.py
@@ -18,8 +18,6 @@ Client classes for callers of a heat system
 """
 
 from lxml import etree
-import os
-import json
 from heat.common import client as base_client
 from heat.common import exception
 

diff --git a/heat/common/urlfetch.py b/heat/common/urlfetch.py
index db17c327326d0320c5d26a38836b54c1caa38904..13fa9223218a433c53f103a06a58599490771b04 100644 (file)
--- a/heat/common/urlfetch.py
+++ b/heat/common/urlfetch.py
@@ -20,8 +20,6 @@ Utility for fetching a resource (e.g. a template) from a URL.
 import urllib2
 import urlparse
 
-from heat.common import exception
-
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

diff --git a/heat/db/sqlalchemy/migrate_repo/versions/013_owner_id_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/013_owner_id_uuid.py
index f1a8d8b536c9c75d5cd0ba315670b84824151282..1d5d6e2c763c925864d04d97fcd4cfa1beb85ac3 100644 (file)
--- a/heat/db/sqlalchemy/migrate_repo/versions/013_owner_id_uuid.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/013_owner_id_uuid.py
@@ -1,6 +1,5 @@
 from sqlalchemy import *
 from migrate import *
-from heat.common import utils
 
 
 def upgrade(migrate_engine):

diff --git a/heat/engine/api.py b/heat/engine/api.py
index 6cfea0a88e2bb5772f3a19cf0c902d65f818580e..db337e32da35fe9d114fbf0853adcbba442e06b7 100644 (file)
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -14,9 +14,7 @@
 
 from heat.rpc.api import *
 from heat.openstack.common import timeutils
-from heat.engine import parser
 from heat.engine import template
-from heat.engine import watchrule
 
 from heat.openstack.common import log as logging
 

diff --git a/heat/engine/clients.py b/heat/engine/clients.py
index 05ff53638ba6d7301d5189a1016a7d8bfa958c68..63b4c54a392955ddaa496813a7da6b359e3fb93c 100644 (file)
--- a/heat/engine/clients.py
+++ b/heat/engine/clients.py
@@ -32,7 +32,6 @@ except ImportError:
     quantumclient_present = False
 
 from heat.common import heat_keystoneclient as kc
-from heat.openstack.common import cfg
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

diff --git a/heat/engine/resources/quantum/subnet.py b/heat/engine/resources/quantum/subnet.py
index 48357eba879565e59079acb1abf35ebc35b84888..ab88241995d127f60de6c5adaf121ecfc3bd40d0 100644 (file)
--- a/heat/engine/resources/quantum/subnet.py
+++ b/heat/engine/resources/quantum/subnet.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.common import exception
-
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 

diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index ab062a9751db2fa9a40936b4e2458a7a1aedb54a..e66e5b37a5c179c5be867f4d1a0b20ebd49cd13a 100644 (file)
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import urllib2
-import json
-
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import resource

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index cda1b010e6113daa5c7e6a105337d40d9b4a56b1..66759ecf9d035ab0162a977158c803217d09e7d6 100644 (file)
--- a/heat/engine/resources/user.py
+++ b/heat/engine/resources/user.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 from heat.common import exception
-from heat.openstack.common import cfg
 from heat.engine import resource
 
 from heat.openstack.common import log as logging

diff --git a/heat/engine/service.py b/heat/engine/service.py
index 0fa8eacd5bc7ae2958fb9d02bd3df6555f04f317..d13a6357a18e128de598314a70736c03c86a0079 100644 (file)
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -15,7 +15,6 @@
 
 import functools
 import webob
-import sqlalchemy.exc
 
 from heat.common import context
 from heat.db import api as db_api

diff --git a/heat/engine/watchrule.py b/heat/engine/watchrule.py
index 59176458c592e4759c580e8a5dc3d53adea03283..dfcae8adae650f16651fd8d1b70b8073f4cf9b16 100644 (file)
--- a/heat/engine/watchrule.py
+++ b/heat/engine/watchrule.py
@@ -21,7 +21,6 @@ from heat.engine import timestamp
 from heat.db import api as db_api
 from heat.engine import parser
 from heat.rpc import api as rpc_api
-from heat.common import context as ctxtlib
 import eventlet
 
 logger = logging.getLogger(__name__)

diff --git a/heat/testing/runner.py b/heat/testing/runner.py
index 6327cf2d81662978ec51637ce80c888844567452..82af7794529b814d3a80b63e135c00634c36604d 100755 (executable)
--- a/heat/testing/runner.py
+++ b/heat/testing/runner.py
@@ -66,8 +66,6 @@ reldir = os.path.join(os.path.dirname(__file__), '..', '..')
 absdir = os.path.abspath(reldir)
 sys.path.insert(0, absdir)
 
-from heat.openstack.common import cfg
-
 
 class _AnsiColorizer(object):
     """

diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py
index a83367ed0e328c110b21c31cb68faa953ce8d1f2..caf390e28859f441aa1ed584ea9831ed4e3cc89b 100644 (file)
--- a/heat/tests/__init__.py
+++ b/heat/tests/__init__.py
@@ -18,7 +18,6 @@ import __builtin__
 setattr(__builtin__, '_', lambda x: x)
 
 import os
-import shutil
 
 from heat.db.sqlalchemy.session import get_engine
 

diff --git a/heat/tests/functional/test_CFN_API_UpdateStack.py b/heat/tests/functional/test_CFN_API_UpdateStack.py
index d540de4f5ec385b0a4c6d13544e55a2a626d4479..540d27d1c9cb703749f494b1efe572cfeee1cf85 100644 (file)
--- a/heat/tests/functional/test_CFN_API_UpdateStack.py
+++ b/heat/tests/functional/test_CFN_API_UpdateStack.py
@@ -15,10 +15,8 @@
 import os
 import util
 import verify
-import re
 from nose.plugins.attrib import attr
 import unittest
-import json
 
 
 @attr(speed='slow')

diff --git a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
index e97aad3186eeeff93be8e307107170e6006bdbd8..365ac40a84c477b7e37fa6ecfbbd52f969b7b1aa 100644 (file)
--- a/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
+++ b/heat/tests/functional/test_OpenShift_Prebuilt_JEOS.py
@@ -16,7 +16,6 @@ import util
 import verify
 from nose.plugins.attrib import attr
 import unittest
-import os
 
 
 @attr(speed='slow')

diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index 27d4fd62a876e7a83f7bed21f44fed21ecc444ed..16c9a20bc6515797f4de0ed4e210c838ebce686f 100644 (file)
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -19,7 +19,6 @@ import paramiko
 import subprocess
 import hashlib
 import email
-import json
 import time  # for sleep
 import errno
 import tempfile
@@ -28,8 +27,6 @@ import re
 from pkg_resources import resource_string
 from lxml import etree
 
-from nose.plugins.attrib import attr
-from nose import with_setup
 from nose.exc import SkipTest
 
 try:

diff --git a/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py
index 1db4f37f48b2aa78df7b69f63ee1aa5143636976..d767a3d36b3d5e147eed887b56b38e4e493f590b 100644 (file)
--- a/heat/tests/test_api_aws.py
+++ b/heat/tests/test_api_aws.py
@@ -13,12 +13,9 @@
 #    under the License.
 
 
-import socket
-import json
 import unittest
 from nose.plugins.attrib import attr
 
-import re
 from heat.api.aws import utils as api_utils
 
 

diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index f65fe71f576c95e8d0fa46a1954533ea81923fe8..7c00c9b6c49dfc0530e22b8c9d27b221b9dcd823 100644 (file)
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -13,15 +13,12 @@
 #    under the License.
 
 
-import socket
 import mox
 import json
 import unittest
 from nose.plugins.attrib import attr
 
-import httplib
 import json
-import urlparse
 
 from heat.common import context
 from heat.common import identifier

diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py
index 149390cc9fd4a29e98ac56257c831e34b31a20a6..1d86112f71dc0d1dcac96e96f65a0dc8c4e6d84b 100644 (file)
--- a/heat/tests/test_api_cloudwatch.py
+++ b/heat/tests/test_api_cloudwatch.py
@@ -13,20 +13,13 @@
 #    under the License.
 
 
-import socket
 import mox
-import json
 import unittest
 from nose.plugins.attrib import attr
 
-import httplib
-import json
-import urlparse
-
 from heat.common import context
 from heat.openstack.common import cfg
 from heat.openstack.common import rpc
-import heat.openstack.common.rpc.common as rpc_common
 from heat.common.wsgi import Request
 from heat.api.aws import exception
 import heat.api.cloudwatch.watch as watches

diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py
index 25f37087c4007a79e498b841701e212f166018d3..e170c5c1bf05f9c911cf629ecac7e60286975783 100644 (file)
--- a/heat/tests/test_autoscaling.py
+++ b/heat/tests/test_autoscaling.py
@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py
index bba5ec39b423a47b319e189f99a3906b2509f584..99d3c368a78f9fd68ea382d234ce5e1df2fd9d4e 100644 (file)
--- a/heat/tests/test_dbinstance.py
+++ b/heat/tests/test_dbinstance.py
@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py
index 4482e61486a026fe211bb9475337c01dd79acbe6..74cd62683abc2945c23262edd179948755d72e18 100644 (file)
--- a/heat/tests/test_eip.py
+++ b/heat/tests/test_eip.py
@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 8a84854d54e513b675936df8719719a3b5db9252..8f4f831df6f8da09daa3c41670121b066578cce0 100644 (file)
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 from nose.plugins.attrib import attr
 
 from heat.common import context

diff --git a/heat/tests/test_identifier.py b/heat/tests/test_identifier.py
index c1d45dda6ed149bbd8807d28fdfdccc4c06a195f..1bceb303b9d413456d2dbe29103500554fd94741 100644 (file)
--- a/heat/tests/test_identifier.py
+++ b/heat/tests/test_identifier.py
@@ -15,8 +15,6 @@
 
 import unittest
 from nose.plugins.attrib import attr
-import mox
-import json
 
 from heat.common import identifier
 

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index 34fa38b687e6eb35e348345e9c4f1120677e9d17..603a85da082fd01bca8219016b72e2ee6d3e94c3 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -17,15 +17,11 @@ import os
 
 import unittest
 import mox
-import json
-import sqlalchemy
 
 from nose.plugins.attrib import attr
-from nose import with_setup
 
 from heat.tests.v1_1 import fakes
 from heat.engine.resources import instance as instances
-import heat.db as db_api
 from heat.common import template_format
 from heat.engine import parser
 from heat.openstack.common import uuidutils

diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 46941b3c923381483db2142438632104ff80c6f1..63c2c618ab2df4bd0fa048d25346a8a28ef919b3 100644 (file)
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -18,7 +18,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py
index aa41f98a35da36bb4e7f877b8a7b5455ea264ed8..3080f6cce9960feca42e02521abcb3047595c5da 100644 (file)
--- a/heat/tests/test_parameters.py
+++ b/heat/tests/test_parameters.py
@@ -15,11 +15,8 @@
 
 import unittest
 from nose.plugins.attrib import attr
-import mox
 import json
 
-from heat.common import context
-from heat.common import exception
 from heat.engine import parameters
 
 

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 32f0947294fa9a393495d1334f83e6b4cfcfce8e..a8080c4a11e04b64d88ba08a11b57d58497f8059 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -16,7 +16,6 @@
 import unittest
 from nose.plugins.attrib import attr
 import mox
-import json
 
 from heat.common import context
 from heat.common import exception

diff --git a/heat/tests/test_properties.py b/heat/tests/test_properties.py
index 8c6970eea16ee8f06f8408bf302acf2e77f6857b..657d17987de06630c2815465ef5cfc06e95923ca 100644 (file)
--- a/heat/tests/test_properties.py
+++ b/heat/tests/test_properties.py
@@ -15,7 +15,6 @@
 
 import unittest
 from nose.plugins.attrib import attr
-import mox
 
 from heat.engine import properties
 

diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py
index 82506faa028d9464b81e24bb9a2120e37b4a0255..8a81f7001a21d2ccb70fe186206e7bd1bcef720a 100644 (file)
--- a/heat/tests/test_quantum.py
+++ b/heat/tests/test_quantum.py
@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index 2720450f6d0f2022125dc3c836f180fdfc5d1020..83836b096e9d1ca7e128b876e04bc75933933e03 100644 (file)
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -17,7 +17,6 @@ import unittest
 from nose.plugins.attrib import attr
 import mox
 
-import json
 from heat.common import context
 from heat.engine import parser
 from heat.engine import resource

diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py
index 0d5ca3031827d709d235cd1b2092d5156fe8da4c..d5bdec7e58b81aec2fc2f7d9513d3505a128e460 100644 (file)
--- a/heat/tests/test_s3.py
+++ b/heat/tests/test_s3.py
@@ -18,7 +18,6 @@ import re
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py
index ce65735efd7b77734ce6a73f6c7efe7208a12ae6..3925830b40449bae20c5cfb29e1b9deabb583eba 100644 (file)
--- a/heat/tests/test_template_format.py
+++ b/heat/tests/test_template_format.py
@@ -13,10 +13,8 @@
 #    under the License.
 
 import json
-import mox
 from nose.plugins.attrib import attr
 import os
-import re
 import unittest
 import yaml
 

diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py
index c90f9924dc09ade9056f80f1055d705ddb412eb6..0737b8d376dbe85ad8e35315d36daa00918154c7 100644 (file)
--- a/heat/tests/test_user.py
+++ b/heat/tests/test_user.py
@@ -15,8 +15,6 @@
 
 import os
 
-import eventlet
-import json
 import mox
 import unittest
 

diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 2df58d30c7fb6a0d218b48b80ee6e72269933d62..50c66fb6c5e6e0e5025c5d3bda383e5e061b0589 100644 (file)
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -15,7 +15,6 @@
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index 3fbdbcea3d2cc5dedc3f44324aaa23d188afb4e9..50c1f859f2019975a303cf117ecf9db856197e33 100644 (file)
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -16,7 +16,6 @@
 import os
 
 import eventlet
-import json
 import mox
 import unittest
 

diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index 65f53342ec663c4ba1a489540527d6cef73b6c12..4ce75d7537ec1762a9ce7f9e1b8db13ed14da26c 100644 (file)
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import json
 import mox
 import uuid
 import time

diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index 8a61a4facea2bd4e19dcf3bc6bede7acd936092c..1a8891b3b7d1cf0c65f699757596e46c1416c5d5 100644 (file)
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -16,7 +16,6 @@
 import datetime
 import mox
 from nose.plugins.attrib import attr
-from nose import with_setup
 import unittest
 from nose.exc import SkipTest
 import logging

diff --git a/setup.py b/setup.py
index a7556ecb5b37ad137b5ffa3bca6429a1a2201eb4..eb0066fb3f7953e555769d82a3919b5951e723e1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import gettext
-import os
-import subprocess
-
 import setuptools
 
 from heat.openstack.common import setup

diff --git a/tools/experimental_ssh_eventlet.py b/tools/experimental_ssh_eventlet.py
index 723d764ae91db385c9ccf83f10ca123ba499f471..eece3ead318f70fbef3b625da846c7d4a942f2e9 100755 (executable)
--- a/tools/experimental_ssh_eventlet.py
+++ b/tools/experimental_ssh_eventlet.py
@@ -3,7 +3,6 @@
 import eventlet
 from eventlet.green import socket
 import libssh2
-import time
 import os
 import random