Enable H305 and H307 style checks

Correct grouping and ordering of imports

Change-Id: I47ea0d53f80d7f0aeb01c1c6afd63713be87ddf4

4 files changed, 4 insertions, 5 deletions

diff --git a/bin/heat-api b/bin/heat-api
index 77f11f8c5..871bcf157 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -20,7 +20,6 @@ import eventlet
 eventlet.monkey_patch(os=False)
 
 import os
-import six
 import sys
 
 # If ../heat/__init__.py exists, add ../ to Python search path, so that
@@ -33,6 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 
 from oslo.config import cfg
 from oslo import i18n
+import six
 
 from heat.common import config
 from heat.common.i18n import _LI
diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 2d1038bc2..10216f8fb 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -22,7 +22,6 @@ import eventlet
 eventlet.monkey_patch(os=False)
 
 import os
-import six
 import sys
 
 # If ../heat/__init__.py exists, add ../ to Python search path, so that
@@ -35,6 +34,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 
 from oslo.config import cfg
 from oslo import i18n
+import six
 
 from heat.common import config
 from heat.common.i18n import _LI
diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch
index 0cecfffbd..00df9970b 100755
--- a/bin/heat-api-cloudwatch
+++ b/bin/heat-api-cloudwatch
@@ -22,7 +22,6 @@ import eventlet
 eventlet.monkey_patch(os=False)
 
 import os
-import six
 import sys
 
 # If ../heat/__init__.py exists, add ../ to Python search path, so that
@@ -35,6 +34,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 
 from oslo.config import cfg
 from oslo import i18n
+import six
 
 from heat.common import config
 from heat.common.i18n import _LI
diff --git a/bin/heat-engine b/bin/heat-engine
index a25f11aef..47348dbd6 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -41,7 +41,6 @@ from heat.common import profiler
 from heat.engine import template
 from heat.openstack.common import log as logging
 from heat.openstack.common import service
-
 from heat.rpc import api as rpc_api
 
 i18n.enable_lazy()
@@ -62,7 +61,7 @@ if __name__ == '__main__':
     if not mgr or not mgr.names():
         sys.exit("ERROR: No template format plugins registered")
 
-    from heat.engine import service as engine
+    from heat.engine import service as engine  # noqa
 
     profiler.setup('heat-engine', cfg.CONF.host)
     srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)