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>

bin/heat-cfn

@@ -26,7 +26,6 @@ import os
 import os.path
 import sys
 import time
-import json
 import logging
 
 import httplib

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]),

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

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):

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
 

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__)

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):

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
 

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__)

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
 

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

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

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

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__)

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):
     """

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
 

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')

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')

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:

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
 
 

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

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

heat/tests/test_autoscaling.py

@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

heat/tests/test_dbinstance.py

@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

heat/tests/test_eip.py

@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

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

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
 

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

heat/tests/test_loadbalancer.py

@@ -18,7 +18,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

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
 
 

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

heat/tests/test_properties.py

@@ -15,7 +15,6 @@
 
 import unittest
 from nose.plugins.attrib import attr
-import mox
 
 from heat.engine import properties
 

heat/tests/test_quantum.py

@@ -17,7 +17,6 @@ import os
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

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

heat/tests/test_s3.py

@@ -18,7 +18,6 @@ import re
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

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
 

heat/tests/test_user.py

@@ -15,8 +15,6 @@
 
 import os
 
-import eventlet
-import json
 import mox
 import unittest
 

heat/tests/test_validate.py

@@ -15,7 +15,6 @@
 
 import unittest
 import mox
-import json
 
 from nose.plugins.attrib import attr
 

heat/tests/test_volume.py

@@ -16,7 +16,6 @@
 import os
 
 import eventlet
-import json
 import mox
 import unittest
 

heat/tests/test_waitcondition.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import json
 import mox
 import uuid
 import time

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

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

tools/experimental_ssh_eventlet.py

@@ -3,7 +3,6 @@
 import eventlet
 from eventlet.green import socket
 import libssh2
-import time
 import os
 import random