Remove unused imports

Change-Id: I4977a34b758f3dd2b5a4772dc074af2f0c715175

diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index bab3fb0635ac76e8765a2fc73b281c8e890eaf2f..dec0afd52c411398452d30cb49a5f194eba2b5aa 100644 (file)
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -16,17 +16,13 @@
 import json
 import urlparse
 import httplib
-import routes
 import gettext
 
 gettext.install('heat', unicode=1)
 
 from heat.common import wsgi
 
-from webob import Request
 import webob
-from heat import utils
-from heat.common import context
 from heat.api.aws import exception
 
 from heat.openstack.common import log as logging

diff --git a/heat/api/cfn/v1/__init__.py b/heat/api/cfn/v1/__init__.py
index ca95e010b05a92065ebd4ce4f6f67aeec74ecb3e..9d259a7cd855fb5cda33fe42ae789009e4cadec0 100644 (file)
--- a/heat/api/cfn/v1/__init__.py
+++ b/heat/api/cfn/v1/__init__.py
@@ -13,20 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-import urlparse
-import httplib
 import routes
 
-from heat.api.cfn.v1 import stacks
-from heat.common import wsgi
-
 from webob import Request
-import webob
-from heat import utils
-from heat.common import context
-from heat.api.aws import exception
 
+from heat.api.cfn.v1 import stacks
+from heat.common import wsgi
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 42f33173805a8400f480c9b0153bda0f7118b20d..0be854ca48e136589c41e1736b50e2a2ae234f1e 100644 (file)
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -19,24 +19,19 @@ Stack endpoint for Heat CloudFormation v1 API.
 
 import httplib
 import json
-import os
 import socket
-import sys
 import urlparse
-import webob
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
 from heat.common import wsgi
-from heat.common import config
-from heat.common import context
-from heat import utils
 from heat.engine import rpcapi as engine_rpcapi
 import heat.engine.api as engine_api
 from heat.engine import identifier
 
-from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
+
 from heat.openstack.common import log as logging
+from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger('heat.api.cfn.v1.stacks')
 

diff --git a/heat/api/cloudwatch/__init__.py b/heat/api/cloudwatch/__init__.py
index 823b757b8bee9b468dc5d1cce017d720a0844d06..73076bc26ff30d978d67089eb8e4f8e14e58463d 100644 (file)
--- a/heat/api/cloudwatch/__init__.py
+++ b/heat/api/cloudwatch/__init__.py
@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-import urlparse
-import httplib
 import routes
 import gettext
 
@@ -25,10 +22,6 @@ from heat.api.cloudwatch import watch
 from heat.common import wsgi
 
 from webob import Request
-import webob
-from heat import utils
-from heat.common import context
-from heat.api.aws import exception
 from heat.api.middleware.version_negotiation import VersionNegotiationFilter
 from heat.api.cloudwatch import versions
 

diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py
index 726146beafce34c50eba79d6464bc0c7ef7a077c..ac6f3504f34299f03d62fb1be4c28aeef5c08211 100644 (file)
--- a/heat/api/cloudwatch/watch.py
+++ b/heat/api/cloudwatch/watch.py
@@ -16,20 +16,12 @@
 """
 endpoint for heat AWS-compatible CloudWatch API
 """
-import os
-import sys
-import re
-import webob
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
 from heat.common import wsgi
-from heat.common import config
-from heat.common import context
-from heat import utils
 from heat.engine import rpcapi as engine_rpcapi
 import heat.engine.api as engine_api
 
-from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common import log as logging
 

diff --git a/heat/api/openstack/v1/__init__.py b/heat/api/openstack/v1/__init__.py
index 446ac7fb357f81ec025168486e44b579be71b7ee..f95f549d10c111d15e6ac6b48bcff9e762f2ae4c 100644 (file)
--- a/heat/api/openstack/v1/__init__.py
+++ b/heat/api/openstack/v1/__init__.py
@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-import urlparse
-import httplib
 import routes
 import gettext
 
@@ -25,11 +22,6 @@ from heat.api.openstack.v1 import stacks
 from heat.api.openstack.v1 import resources
 from heat.common import wsgi
 
-from webob import Request
-import webob
-from heat import utils
-from heat.common import context
-
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

diff --git a/heat/common/client.py b/heat/common/client.py
index ba4e294cb4ea7933476267f448781978933a02d0..d70aa8d5c0ca595301cab9bb0fc4a01234cbcdc4 100644 (file)
--- a/heat/common/client.py
+++ b/heat/common/client.py
@@ -21,14 +21,14 @@ import collections
 import errno
 import functools
 import httplib
-import logging
 import os
 import urllib
 import urlparse
 
 try:
-    from eventlet.green import socket, ssl
+    from eventlet.green import socket, socket, ssl
 except ImportError:
+    import select
     import socket
     import ssl
 

diff --git a/heat/common/config.py b/heat/common/config.py
index a89ea9bc00e9d5f2bf01ad5ca934dbea77481762..d56ef88f13ebe2dfd7aab76eafbebe0cea5e485e 100644 (file)
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -22,14 +22,12 @@ import logging
 import logging.config
 import logging.handlers
 import os
-import socket
-# TODO ^ eventlet.socket ?
 import sys
 
-from heat import version
+from eventlet.green import socket
+
 from heat.common import wsgi
 from heat.openstack.common import cfg
-from heat.openstack.common import rpc
 
 DEFAULT_PORT = 8000
 

diff --git a/heat/common/context.py b/heat/common/context.py
index ac0ff67d61e8002409297c059f452293ea9f69e6..3a8eb73cac57adbfa5a97c294f2aec52c0ac1567 100644 (file)
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -19,7 +19,6 @@ from heat.common import wsgi
 from heat.openstack.common import cfg
 from heat.openstack.common import importutils
 from heat.common import utils as heat_utils
-import json
 
 
 def generate_request_id():

diff --git a/heat/common/utils.py b/heat/common/utils.py
index d4e94ad97db61b9c39af94c0bc48ae122bd8bc5d..8556d978fd6cc12df87024ef0d552aa8e42a1911 100644 (file)
--- a/heat/common/utils.py
+++ b/heat/common/utils.py
@@ -20,16 +20,11 @@
 System-level utilities and helper functions.
 """
 
-import datetime
 import sys
 import uuid
 
 from eventlet import event
 from eventlet import greenthread
-from eventlet import semaphore
-from eventlet.green import subprocess
-
-from heat.openstack.common import exception
 
 
 def chunkreadable(iter, chunk_size=65536):

diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 11d990a13c5f1724198060237e6381b2ccec1f10..dbc6a73af95bcee98a4b4bd1efcf2903811c3424 100644 (file)
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -28,10 +28,8 @@ import os
 import signal
 import sys
 import time
-import re
 from lxml import etree
 
-
 import eventlet
 import eventlet.greenio
 from eventlet.green import socket, ssl
@@ -45,7 +43,6 @@ import webob.exc
 from heat.common import exception
 from heat.openstack.common import cfg
 from heat.openstack.common import importutils
-from heat.openstack.common import utils
 
 
 URL_LENGTH_LIMIT = 50000

diff --git a/heat/db/api.py b/heat/db/api.py
index 2b6cf106f32ee35119c00ce462e1baa85ec389d6..27a9db37770b275ebaaab27e7f06da062c6ef212 100644 (file)
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -26,9 +26,8 @@ The underlying driver is loaded . SQLAlchemy is currently the only
 supported backend.
 '''
 import heat.utils
-from heat.openstack.common import utils
 from heat.openstack.common import cfg
-import heat.utils
+
 
 SQL_CONNECTION = 'sqlite://'
 SQL_IDLE_TIMEOUT = 3600

diff --git a/heat/db/sqlalchemy/migration.py b/heat/db/sqlalchemy/migration.py
index 5af83a1514bfb23fd2fc599b2653e58d6451a2db..95af8d91cbe4960e212d40001aa37c51ad94a760 100644 (file)
--- a/heat/db/sqlalchemy/migration.py
+++ b/heat/db/sqlalchemy/migration.py
@@ -21,6 +21,8 @@ import sqlalchemy
 import migrate
 from migrate.versioning import util as migrate_util
 
+from heat.openstack.common import exception
+
 _REPOSITORY = None
 
 

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 03abeafec3e5433e2fbdee5b2072281db3a20fb6..c95df804b8eb95ec0b22a0a714ecda5c121e379e 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -19,7 +19,6 @@ from sqlalchemy import *
 from sqlalchemy.orm import relationship, backref, object_mapper
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.schema import ForeignKeyConstraint
 from sqlalchemy import types as types
 from json import dumps, loads
 from heat.common import utils

diff --git a/heat/engine/api.py b/heat/engine/api.py
index 74d4c75024c61f98c0d096ef2cd55a0c7770bcf0..0f1685f72f06b1c39fa2bd114be4fef8c2402f35 100644 (file)
--- a/heat/engine/api.py
+++ b/heat/engine/api.py
@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import re
 from heat.openstack.common import timeutils
 from heat.engine import parser
 from heat.engine import template

diff --git a/heat/engine/auth.py b/heat/engine/auth.py
index 1b1a11c9ff855f275430c8eb428382fa767c606e..4c869cfe8452c37ea51f6504784317ae1ab59c3f 100644 (file)
--- a/heat/engine/auth.py
+++ b/heat/engine/auth.py
@@ -13,22 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-import httplib
-import urlparse
 import base64
-from novaclient.v1_1 import client
-from novaclient.exceptions import BadRequest
-from novaclient.exceptions import NotFound
-from novaclient.exceptions import AuthorizationFailure
-from heat.common import context
-from heat.openstack.common import log as logging
 
 from Crypto.Cipher import AES
 from Crypto import Random
 
 from heat.openstack.common import cfg
-from heat.openstack.common import importutils
+from heat.openstack.common import log as logging
 
 
 auth_opts = [

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index eda5af997924050efdafafde0fe0aeb94975dc54..2a6e575a808464732d4c6f3e78803a922e3fa9ae 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -14,9 +14,7 @@
 #    under the License.
 
 import eventlet
-import json
 import functools
-import copy
 
 from heat.common import exception
 from heat.engine import dependencies

diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py
index 3feff0c3054e2818110de803cf93d870ab38010c..ac05d642fad4a5767fd4c791c2ff59696b20d394 100644 (file)
--- a/heat/engine/resources/cloud_watch.py
+++ b/heat/engine/resources/cloud_watch.py
@@ -13,10 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
-import json
-import os
-
 from heat.common import exception
 from heat.engine import watchrule
 from heat.engine.resources import resource

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 59c28ab3577c609161617ae4df774efe1b903821..8364250345c4930fcd84a6e815ceaebc25dc4d5c 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -16,7 +16,6 @@
 import eventlet
 import os
 import json
-import sys
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from novaclient.exceptions import NotFound

diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py
index 534f1f1e427e3976389022d65138906e14fa592a..b6ddc37502b48737dada94aa0afe5f14b56790e3 100644 (file)
--- a/heat/engine/resources/loadbalancer.py
+++ b/heat/engine/resources/loadbalancer.py
@@ -13,13 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import urllib2
 import json
 
 from heat.common import exception
 from heat.engine.resources import stack
-from heat.db import api as db_api
-from heat.engine import parser
 from novaclient.exceptions import NotFound
 
 from heat.openstack.common import log as logging

diff --git a/heat/engine/resources/resource.py b/heat/engine/resources/resource.py
index ad3fcb3f685e397affe3b738449faf81e02f17c9..d22a12a308dfb194e4b13e2dbd0efc56347980c1 100644 (file)
--- a/heat/engine/resources/resource.py
+++ b/heat/engine/resources/resource.py
@@ -17,14 +17,12 @@ import base64
 from datetime import datetime
 
 from heat.common import exception
-from heat.common import config
 from heat.db import api as db_api
 from heat.engine import identifier
 from heat.engine import timestamp
 from heat.engine.resources.properties import Properties
 
 from heat.openstack.common import log as logging
-from heat.openstack.common import cfg
 
 logger = logging.getLogger('heat.engine.resources')
 

diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py
index d304eb0d16f3f57dc9f83699ed2b6b212d12483b..2b146a20cf7a055ddd061cbfaf89e501805ab302 100644 (file)
--- a/heat/engine/resources/security_group.py
+++ b/heat/engine/resources/security_group.py
@@ -15,7 +15,6 @@
 
 from novaclient.exceptions import BadRequest
 from novaclient.exceptions import NotFound
-from heat.common import exception
 from heat.engine.resources import resource
 
 from heat.openstack.common import log as logging

diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index a729b37b979bc4f0fae8b5c7dbbcdb784dedd672..592d08ed57f1334f7ce1896c3edc43ff46e0ca4c 100644 (file)
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -18,7 +18,6 @@ import json
 
 from heat.common import exception
 from heat.engine.resources import resource
-from heat.db import api as db_api
 from heat.engine import parser
 
 from heat.openstack.common import log as logging

diff --git a/heat/engine/rpcapi.py b/heat/engine/rpcapi.py
index 92254b273a9b80f59880e816b588aa72c78bf8f1..534c6292581ff53946549b0859e81a3aa78bcdd4 100644 (file)
--- a/heat/engine/rpcapi.py
+++ b/heat/engine/rpcapi.py
@@ -19,9 +19,7 @@ Client side of the heat engine RPC API.
 """
 
 from heat.openstack.common import cfg
-from heat.openstack.common import exception
 from heat.openstack.common import rpc
-from heat.openstack.common.rpc import common as rpc_common
 import heat.openstack.common.rpc.proxy