Order imports in alphabetical order (2/9)

This patch is one in a series to re-enable H306 style check rule
(imports are in alphabetical order). It touches API files.

Implements: blueprint reduce-flake8-ignored-rules (partial)
Change-Id: I81c7c79516ce1a17055c3b9c12a94312ed3d1940

heat/api/aws/ec2token.py

@@ -14,24 +14,22 @@
 #    under the License.
 
 import hashlib
-import requests
 
-from heat.openstack.common import gettextutils
+from oslo.config import cfg
+import requests
+import webob
+
+from heat.api.aws import exception
 from heat.api.aws.exception import HeatAPIException
+from heat.common import wsgi
+from heat.openstack.common import gettextutils
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import importutils
+from heat.openstack.common import jsonutils as json
+from heat.openstack.common import log as logging
 
 gettextutils.install('heat')
 
-from heat.common import wsgi
-from heat.openstack.common import jsonutils as json
-from oslo.config import cfg
-from heat.openstack.common import importutils
-
-import webob
-from heat.api.aws import exception
-
-from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
-
 logger = logging.getLogger(__name__)
 
 

heat/api/aws/exception.py

@@ -18,9 +18,10 @@
 """Heat API exception subclasses - maps API response errors to AWS Errors"""
 
 import webob.exc
+
 from heat.common import wsgi
 from heat.openstack.common.gettextutils import _
-import heat.openstack.common.rpc.common as rpc_common
+from heat.openstack.common.rpc import common as rpc_common
 
 
 class HeatAPIException(webob.exc.HTTPError):

heat/api/aws/utils.py

@@ -17,12 +17,12 @@
 Helper utilities related to the AWS API implementations
 '''
 
-import re
 import itertools
-from heat.api.aws import exception
+import re
 
-from heat.openstack.common import log as logging
+from heat.api.aws import exception
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

heat/api/cfn/__init__.py

@@ -13,15 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.api.cfn import versions
+from heat.api.middleware.version_negotiation import VersionNegotiationFilter
 from heat.openstack.common import gettextutils
 
 gettextutils.install('heat')
 
 
-from heat.api.middleware.version_negotiation import VersionNegotiationFilter
-from heat.api.cfn import versions
-
-
 def version_negotiation_filter(app, conf, **local_conf):
     return VersionNegotiationFilter(versions.Controller, app,
                                     conf, **local_conf)

heat/api/cfn/v1/__init__.py

@@ -14,11 +14,10 @@
 #    under the License.
 
 import routes
-
 from webob import Request
 
-from heat.api.cfn.v1 import stacks
 from heat.api.cfn.v1 import signal
+from heat.api.cfn.v1 import stacks
 from heat.common import wsgi
 from heat.openstack.common import log as logging
 

heat/api/cfn/v1/signal.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.api.aws import exception
+from heat.common import identifier
 from heat.common import wsgi
 from heat.rpc import client as rpc_client
-from heat.common import identifier
-from heat.api.aws import exception
 
 
 class SignalController(object):

heat/api/cfn/v1/stacks.py

@@ -22,17 +22,16 @@ import socket
 
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
-from heat.common import wsgi
 from heat.common import exception as heat_exception
-from heat.rpc import client as rpc_client
-from heat.common import template_format
-from heat.rpc import api as engine_api
 from heat.common import identifier
-from heat.common import urlfetch
 from heat.common import policy
-
-from heat.openstack.common import log as logging
+from heat.common import template_format
+from heat.common import urlfetch
+from heat.common import wsgi
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+from heat.rpc import api as engine_api
+from heat.rpc import client as rpc_client
 
 logger = logging.getLogger(__name__)
 

heat/api/cloudwatch/__init__.py

@@ -14,22 +14,17 @@
 #    under the License.
 
 import routes
-
-from heat.openstack.common import gettextutils
-
-gettextutils.install('heat')
-
-from heat.api.cloudwatch import watch
-from heat.common import wsgi
-
 from webob import Request
-from heat.api.middleware.version_negotiation import VersionNegotiationFilter
+
 from heat.api.cloudwatch import versions
-
-
+from heat.api.cloudwatch import watch
+from heat.api.middleware.version_negotiation import VersionNegotiationFilter
+from heat.common import wsgi
+from heat.openstack.common import gettextutils
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
+gettextutils.install('heat')
 
 
 class API(wsgi.Router):

heat/api/cloudwatch/watch.py

@@ -18,15 +18,14 @@ endpoint for heat AWS-compatible CloudWatch API
 """
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
-from heat.common import wsgi
-from heat.common import policy
 from heat.common import exception as heat_exception
-from heat.rpc import client as rpc_client
-from heat.rpc import api as engine_api
-
-import heat.openstack.common.rpc.common as rpc_common
-from heat.openstack.common import log as logging
+from heat.common import policy
+from heat.common import wsgi
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+from heat.openstack.common.rpc import common as rpc_common
+from heat.rpc import api as engine_api
+from heat.rpc import client as rpc_client
 
 logger = logging.getLogger(__name__)
 

heat/api/middleware/fault.py

@@ -21,8 +21,9 @@ Cinder's faultwrapper
 """
 
 import traceback
-import webob
+
 from oslo.config import cfg
+import webob
 
 cfg.CONF.import_opt('debug', 'heat.openstack.common.log')
 

heat/api/middleware/ssl.py

@@ -13,6 +13,7 @@
 # under the License.
 
 from oslo.config import cfg
+
 from heat.common import wsgi
 
 ssl_middleware_opts = [

heat/api/middleware/version_negotiation.py

@@ -20,12 +20,13 @@ return
 """
 
 import re
+
 import webob
 
-from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
-
 from heat.common import wsgi
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+
 
 logger = logging.getLogger(__name__)
 

heat/api/openstack/__init__.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.api.middleware.version_negotiation import VersionNegotiationFilter
 from heat.api.middleware.fault import FaultWrapper
 from heat.api.middleware.ssl import SSLMiddleware
+from heat.api.middleware.version_negotiation import VersionNegotiationFilter
 from heat.api.openstack import versions
 
 

heat/api/openstack/v1/__init__.py

@@ -15,15 +15,14 @@
 
 import routes
 
-from heat.api.openstack.v1 import stacks
-from heat.api.openstack.v1 import resources
-from heat.api.openstack.v1 import events
 from heat.api.openstack.v1 import actions
 from heat.api.openstack.v1 import build_info
+from heat.api.openstack.v1 import events
+from heat.api.openstack.v1 import resources
 from heat.api.openstack.v1 import software_configs
 from heat.api.openstack.v1 import software_deployments
+from heat.api.openstack.v1 import stacks
 from heat.common import wsgi
-
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

heat/api/openstack/v1/events.py

@@ -14,12 +14,13 @@
 #    under the License.
 
 import itertools
+
 from webob import exc
 
 from heat.api.openstack.v1 import util
+from heat.common import identifier
 from heat.common import wsgi
 from heat.rpc import api as engine_api
-from heat.common import identifier
 from heat.rpc import client as rpc_client
 
 

heat/api/openstack/v1/resources.py

@@ -16,9 +16,9 @@
 import itertools
 
 from heat.api.openstack.v1 import util
+from heat.common import identifier
 from heat.common import wsgi
 from heat.rpc import api as engine_api
-from heat.common import identifier
 from heat.rpc import client as rpc_client
 
 

heat/api/openstack/v1/stacks.py

@@ -21,15 +21,14 @@ from webob import exc
 
 from heat.api.openstack.v1 import util
 from heat.api.openstack.v1.views import stacks_view
-from heat.common import identifier
-from heat.common import wsgi
-from heat.common import template_format
 from heat.common import environment_format
+from heat.common import identifier
+from heat.common import template_format
+from heat.common import urlfetch
+from heat.common import wsgi
+from heat.openstack.common import log as logging
 from heat.rpc import api as engine_api
 from heat.rpc import client as rpc_client
-from heat.common import urlfetch
-
-from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/api/openstack/v1/util.py

@@ -13,9 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from webob import exc
 from functools import wraps
 
+from webob import exc
+
 from heat.common import identifier