Enable H305 and H307 style checks

Correct grouping and ordering of imports

Change-Id: I47ea0d53f80d7f0aeb01c1c6afd63713be87ddf4

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

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

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

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)

contrib/nova_flavor/nova_flavor/tests/test_nova_flavor.py

@@ -18,9 +18,9 @@ from heat.engine import resource
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils
+from heat.tests.v1_1 import fakes
 
 from ..resources import nova_flavor  # noqa
-from heat.tests.v1_1 import fakes
 
 flavor_template = {
     'heat_template_version': '2013-05-23',

contrib/rackspace/rackspace/clients.py

@@ -18,7 +18,10 @@ import random
 import time
 import urlparse
 
+from glanceclient import client as gc
 from oslo.config import cfg
+from swiftclient import utils as swiftclient_utils
+from troveclient import client as tc
 
 from heat.common import exception
 from heat.common.i18n import _LI
@@ -29,12 +32,8 @@ from heat.engine.clients.os import glance
 from heat.engine.clients.os import nova
 from heat.engine.clients.os import swift
 from heat.engine.clients.os import trove
-
 from heat.openstack.common import log as logging
 
-from glanceclient import client as gc
-from swiftclient import utils as swiftclient_utils
-from troveclient import client as tc
 
 LOG = logging.getLogger(__name__)
 

contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py

@@ -14,9 +14,10 @@
 
 import copy
 import json
+import uuid
+
 import mock
 import six
-import uuid
 
 from heat.common import exception
 from heat.common import template_format

contrib/rackspace/rackspace/tests/test_cloudnetworks.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import uuid
 
 import mock
+import six
 
 from heat.common import exception
 from heat.common import template_format

heat/cloudinit/loguserdata.py

@@ -17,10 +17,11 @@ from distutils import version
 import errno
 import logging
 import os
-import pkg_resources
 import subprocess
 import sys
 
+import pkg_resources
+
 
 VAR_PATH = '/var/lib/heat-cfntools'
 LOG = logging.getLogger('heat-provision')

heat/common/heat_keystoneclient.py

@@ -16,7 +16,6 @@
 import collections
 import copy
 import json
-from oslo.utils import importutils
 import uuid
 
 from keystoneclient.auth.identity import v3 as kc_auth_v3
@@ -24,6 +23,7 @@ import keystoneclient.exceptions as kc_exception
 from keystoneclient import session
 from keystoneclient.v3 import client as kc_v3
 from oslo.config import cfg
+from oslo.utils import importutils
 
 from heat.common import context
 from heat.common import exception

heat/common/plugin_loader.py

@@ -20,10 +20,11 @@ for them before loading them.
 """
 
 import pkgutil
-import six
 import sys
 import types
 
+import six
+
 from heat.common.i18n import _LE
 from heat.openstack.common import log as logging
 

heat/common/template_format.py

@@ -14,9 +14,9 @@
 import itertools
 import json
 import re
-import six
 
 from oslo.config import cfg
+import six
 import yaml
 
 from heat.common import exception

heat/common/urlfetch.py

@@ -16,7 +16,6 @@
 from oslo.config import cfg
 import requests
 from requests import exceptions
-
 from six.moves import urllib
 
 from heat.common import exception

heat/db/sqlalchemy/api.py

@@ -13,13 +13,13 @@
 
 '''Implementation of SQLAlchemy backend.'''
 import datetime
-import six
 import sys
 
 from oslo.config import cfg
 from oslo.db.sqlalchemy import session as db_session
 from oslo.db.sqlalchemy import utils
 import osprofiler.sqlalchemy
+import six
 import sqlalchemy
 from sqlalchemy import orm
 from sqlalchemy.orm import session as orm_session

heat/engine/attributes.py

@@ -12,9 +12,10 @@
 #    under the License.
 
 import collections
-import six
 import warnings
 
+import six
+
 from heat.common.i18n import _
 from heat.engine import constraints as constr
 from heat.engine import support

heat/engine/cfn/template.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import collections
+
 import six
 
 from heat.common.i18n import _

heat/engine/clients/__init__.py

@@ -11,12 +11,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
+import warnings
 
 from oslo.config import cfg
 from oslo.utils import importutils
+import six
 from stevedore import extension
-import warnings
 
 from heat.common import exception
 from heat.common.i18n import _LE

heat/engine/clients/client_plugin.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import abc
+
 from oslo.config import cfg
 import six
 

heat/engine/hot/functions.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import collections
+
 import six
 
 from heat.common import exception

heat/engine/hot/template.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import collections
+
 import six
 
 from heat.common import exception

heat/engine/resource.py

@@ -14,11 +14,12 @@
 import base64
 import contextlib
 import datetime as dt
+import warnings
+
 from oslo.config import cfg
 from oslo.utils import encodeutils
 from oslo.utils import excutils
 import six
-import warnings
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/resources/aws/autoscaling_group.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import math
+
 from oslo.utils import excutils
 import six
 

heat/engine/resources/aws/scaling_policy.py

@@ -15,7 +15,6 @@ import six
 from heat.common import exception
 from heat.common.i18n import _
 from heat.common.i18n import _LI
-
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties

heat/engine/resources/eip.py

@@ -10,9 +10,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import six
 
 from oslo.utils import excutils
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/resources/loadbalancer.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import os
-import six
 
 from oslo.config import cfg
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/resources/nova_floatingip.py

@@ -10,9 +10,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import six
 
 from oslo.utils import excutils
+import six
 
 from heat.common.i18n import _
 from heat.common.i18n import _LE

heat/engine/resources/nova_utils.py

@@ -16,15 +16,15 @@ import email
 from email.mime import multipart
 from email.mime import text
 import json
-from novaclient import exceptions as nova_exceptions
 import os
 import pkgutil
 import string
+import warnings
 
+from novaclient import exceptions as nova_exceptions
 from oslo.config import cfg
 import six
 from six.moves.urllib import parse as urlparse
-import warnings
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/resources/openstack/scaling_policy.py

@@ -20,9 +20,8 @@ from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
 from heat.engine import signal_responder
-from heat.scaling import cooldown
-
 from heat.openstack.common import log as logging
+from heat.scaling import cooldown
 
 LOG = logging.getLogger(__name__)
 

heat/engine/resources/openstack/wait_condition.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import json
+
 import six
 
 from heat.common.i18n import _
@@ -23,7 +24,6 @@ from heat.engine import resource
 from heat.engine.resources import wait_condition as wc_base
 from heat.engine import scheduler
 from heat.engine import support
-
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/resources/remote_stack.py

@@ -23,7 +23,6 @@ from heat.engine import environment
 from heat.engine import function
 from heat.engine import properties
 from heat.engine import resource
-
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/resources/resource_group.py

@@ -13,6 +13,7 @@
 
 import collections
 import copy
+
 import six
 
 from heat.common import exception

heat/engine/resources/s3.py

@@ -11,7 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-
 from six.moves.urllib import parse as urlparse
 
 from heat.common import exception

heat/engine/resources/server.py

@@ -12,12 +12,12 @@
 #    under the License.
 
 import copy
-import six
 import uuid
 
 from oslo.config import cfg
 from oslo.serialization import jsonutils
 from oslo.utils import uuidutils
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/resources/software_config/software_deployment.py

@@ -12,9 +12,10 @@
 #    under the License.
 
 import copy
-import six
 import uuid
 
+import six
+
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import attributes

heat/engine/resources/software_config/structured_config.py

@@ -13,6 +13,7 @@
 
 import collections
 import functools
+
 import six
 
 from heat.common import exception

heat/engine/resources/swift.py

@@ -11,7 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-
 from six.moves.urllib import parse as urlparse
 
 from heat.common import exception

heat/engine/resources/swiftsignal.py

@@ -12,9 +12,10 @@
 #    under the License.
 
 import json
-import six
 import urlparse
 
+import six
+
 from heat.common import exception
 from heat.common.i18n import _
 from heat.common.i18n import _LI

heat/engine/rsrc_defn.py

@@ -14,10 +14,10 @@ import collections
 import copy
 import itertools
 import operator
+
 import six
 
 from heat.common import exception
-
 from heat.engine import function
 from heat.engine import properties
 

heat/engine/service.py

@@ -15,6 +15,7 @@ import collections
 import functools
 import json
 import os
+import warnings
 
 import eventlet
 from oslo.config import cfg
@@ -24,7 +25,6 @@ from oslo.utils import uuidutils
 from osprofiler import profiler
 import requests
 import six
-import warnings
 import webob
 
 from heat.common import context

heat/engine/stack_resource.py

@@ -12,10 +12,10 @@
 #    under the License.
 
 import hashlib
-import six
 
 from oslo.config import cfg
 from oslo.serialization import jsonutils
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/engine/template.py

@@ -15,6 +15,7 @@ import abc
 import collections
 import copy
 import functools
+
 import six
 from stevedore import extension
 

heat/scaling/template.py

@@ -12,7 +12,6 @@
 #    under the License.
 
 from heat.common import short_id
-
 from heat.engine import template
 
 

heat/tests/autoscaling/test_heat_scaling_policy.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import datetime
+
 import mock
 from oslo.config import cfg
 from oslo.utils import timeutils

heat/tests/autoscaling/test_scaling_policy.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import datetime
+
 import mock
 from oslo.config import cfg
 from oslo.utils import timeutils

heat/tests/aws/test_volume.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import copy
-import mock
 
 from cinderclient import exceptions as cinder_exp
+import mock
 import mox
 from oslo.config import cfg
 import six

heat/tests/aws/test_waitcondition.py

@@ -14,12 +14,12 @@
 import copy
 import datetime
 import json
-import six
 import time
 import uuid
 
 import mox
 from oslo.config import cfg
+import six
 
 from heat.common import identifier
 from heat.common import template_format

heat/tests/openstack/test_waitcondition.py

@@ -11,10 +11,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import time
 import uuid
 
+import six
+
 from heat.common import identifier
 from heat.common import template_format
 from heat.db import api as db_api

heat/tests/test_api_cfn_v1.py

@@ -13,10 +13,10 @@
 
 import json
 import os
-import six
 
 import mock
 from oslo.config import cfg
+import six
 
 from heat.api.aws import exception
 import heat.api.cfn.v1.stacks as stacks

heat/tests/test_api_ec2token.py

@@ -13,11 +13,11 @@
 
 
 import json
-import six
 
 from oslo.config import cfg
 from oslo.utils import importutils
 import requests
+import six
 
 from heat.api.aws import ec2token
 from heat.api.aws import exception

heat/tests/test_autoscaling_update_policy.py

@@ -13,10 +13,10 @@
 
 import copy
 import json
-import six
 
 import mox
 from oslo.config import cfg
+import six
 from testtools import matchers
 
 from heat.common import exception

heat/tests/test_cinder_client.py

@@ -12,9 +12,10 @@
 #    under the License.
 """Tests for :module:'heat.engine.clients.os.cinder'."""
 
-import mock
 import uuid
 
+import mock
+
 from heat.common import exception
 from heat.engine.clients.os import cinder
 from heat.tests import common

heat/tests/test_clients.py

@@ -11,23 +11,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from ceilometerclient import exc as ceil_exc
 from ceilometerclient.openstack.common.apiclient import exceptions as c_a_exc
 from cinderclient import exceptions as cinder_exc
 from glanceclient import exc as glance_exc
+from heatclient import client as heatclient
 from heatclient import exc as heat_exc
 from keystoneclient import exceptions as keystone_exc
-from neutronclient.common import exceptions as neutron_exc
-from saharaclient.api import base as sahara_base
-from swiftclient import exceptions as swift_exc
-from troveclient import client as troveclient
-
-from heatclient import client as heatclient
 import mock
+from neutronclient.common import exceptions as neutron_exc
 from oslo.config import cfg
+from saharaclient.api import base as sahara_base
+import six
+from swiftclient import exceptions as swift_exc
 from testtools import testcase
+from troveclient import client as troveclient
 
 from heat.common import exception
 from heat.engine import clients

heat/tests/test_cloud_config.py

@@ -11,9 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import uuid
 
+import mock
+
 from heat.engine import parser
 from heat.engine.resources.software_config import cloud_config as cc
 from heat.engine import template

heat/tests/test_common_context.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
+
+import mock
 from oslo.config import cfg
 from oslo_middleware import request_id
 import webob

heat/tests/test_eip.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import mox
 from neutronclient.v2_0 import client as neutronclient
 from novaclient import exceptions as nova_exceptions

heat/tests/test_engine_api_utils.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import datetime as dt
+import json
 import uuid
 
-import json
 import mock
 import six
 

heat/tests/test_engine_service.py

@@ -11,13 +11,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import eventlet
 import functools
 import json
 import sys
 import uuid
 
+import eventlet
 from eventlet import event as grevent
 import mock
 import mox

heat/tests/test_fault_middleware.py

@@ -12,13 +12,13 @@
 #    under the License.
 
 import inspect
-from oslo.config import cfg
 import re
+
+from oslo.config import cfg
+from oslo.messaging._drivers import common as rpc_common
 import six
 import webob
 
-from oslo.messaging._drivers import common as rpc_common
-
 import heat.api.middleware.fault as fault
 from heat.common import exception as heat_exc
 from heat.common.i18n import _

heat/tests/test_function.py

@@ -12,9 +12,10 @@
 #    under the License.
 
 import copy
-import six
 import uuid
 
+import six
+
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine.cfn import functions

heat/tests/test_glance_client.py

@@ -11,11 +11,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-import six
 import uuid
 
 from glanceclient import exc as glance_exceptions
+import mock
+import six
 
 from heat.common import exception
 from heat.engine.clients.os import glance

heat/tests/test_heatclient.py

@@ -12,8 +12,6 @@
 #    under the License.
 
 import json
-import mox
-import six
 import uuid
 
 from keystoneclient.auth.identity import v3 as ks_auth_v3
@@ -21,7 +19,9 @@ import keystoneclient.exceptions as kc_exception
 from keystoneclient import session as ks_session
 from keystoneclient.v3 import client as kc_v3
 from keystoneclient.v3 import domains as kc_v3_domains
+import mox
 from oslo.config import cfg
+import six
 
 from heat.common import exception
 from heat.common import heat_keystoneclient

heat/tests/test_hot.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import six
 
 from heat.common import exception

heat/tests/test_instance.py

@@ -12,13 +12,13 @@
 #    under the License.
 
 import copy
-import six
 import uuid
 
 from glanceclient import exc as glance_exceptions
 import mock
 import mox
 from neutronclient.v2_0 import client as neutronclient
+import six
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/test_instance_group.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import copy
-import six
 
 import mock
+import six
 
 from heat.common import exception
 from heat.common import grouputils

heat/tests/test_loguserdata.py

@@ -12,11 +12,12 @@
 #    under the License.
 
 import errno
-import mox
 import os
-import pkg_resources
 import subprocess
 
+import mox
+import pkg_resources
+
 from heat.cloudinit import loguserdata
 from heat.tests import common
 

heat/tests/test_multi_part.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import email
+import uuid
 
 import mock
-import uuid
 
 from heat.common import exception as exc
 from heat.engine import parser

heat/tests/test_nested_stack.py

@@ -14,12 +14,12 @@
 
 import copy
 import json
-import six
-import yaml
 
 import mock
 from oslo.config import cfg
 from requests import exceptions
+import six
+import yaml
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/test_neutron.py

@@ -12,13 +12,13 @@
 #    under the License.
 
 import copy
-import six
 
 import mock
 import mox
 from neutronclient.common import exceptions as qe
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.v2_0 import client as neutronclient
+import six
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/test_neutron_autoscaling.py

@@ -12,10 +12,10 @@
 #    under the License.
 
 import copy
-from neutronclient.v2_0 import client as neutronclient
 import uuid
 
 import mox
+from neutronclient.v2_0 import client as neutronclient
 from oslo.config import cfg
 
 from heat.common import template_format

heat/tests/test_neutron_firewall.py

@@ -12,10 +12,10 @@
 #    under the License.
 
 import copy
-import six
 
 from neutronclient.common import exceptions
 from neutronclient.v2_0 import client as neutronclient
+import six
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/test_neutron_loadbalancer.py

@@ -12,13 +12,13 @@
 #    under the License.
 
 import copy
-import mox
-from oslo.config import cfg
-import six
 
+import mox
 from neutronclient.common import exceptions
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.v2_0 import client as neutronclient
+from oslo.config import cfg
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/tests/test_neutron_vpnservice.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import mox
 from neutronclient.common import exceptions
 from neutronclient.neutron import v2_0 as neutronV20

heat/tests/test_nova_client.py

@@ -13,11 +13,12 @@
 """Tests for :module:'heat.engine.resources.nova_utls'."""
 
 import collections
+import uuid
+
 import mock
 from novaclient import exceptions as nova_exceptions
 from oslo.config import cfg
 import six
-import uuid
 
 from heat.common import exception
 from heat.engine.clients.os import nova

heat/tests/test_nova_floatingip.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import mock
 import six
 

heat/tests/test_nova_keypair.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import mock
 import six
 

heat/tests/test_nova_servergroup.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import json
+
 import mock
 
 from heat.common import template_format

heat/tests/test_nova_utils.py

@@ -13,11 +13,11 @@
 
 """Tests for :module:'heat.engine.resources.nova_utls'."""
 
-import mock
-import six
 import uuid
 
+import mock
 from novaclient import exceptions as nova_exceptions
+import six
 
 from heat.common import exception
 from heat.engine.resources import nova_utils

heat/tests/test_parameters.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import json
-import six
 
+import six
 import testtools
 
 from heat.common import exception

heat/tests/test_parser.py

@@ -15,13 +15,13 @@ import collections
 import copy
 import json
 import time
+import warnings
 
 from keystoneclient import exceptions as kc_exceptions
 import mock
 import mox
 from oslo.config import cfg
 import six
-import warnings
 
 from heat.common import context
 from heat.common import exception

heat/tests/test_provider_template.py

@@ -13,10 +13,10 @@
 
 import json
 import os
-import six
 import uuid
 
 import mock
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/tests/test_remote_stack.py

@@ -12,12 +12,12 @@
 #    under the License.
 
 import copy
-import mock
-import six
 
 from heatclient import exc
 from heatclient.v1 import stacks
+import mock
 from oslo.config import cfg
+import six
 
 from heat.common import exception
 from heat.common.i18n import _

heat/tests/test_resource_group.py

@@ -12,9 +12,10 @@
 #    under the License.
 
 import copy
+import uuid
+
 import mock
 import six
-import uuid
 
 from heat.common import exception
 from heat.engine import properties

heat/tests/test_rpc_client.py

@@ -17,8 +17,8 @@
 Unit Tests for heat.rpc.client
 """
 
-
 import copy
+
 import mock
 from oslo.messaging._drivers import common as rpc_common
 import stubout

heat/tests/test_rsrc_defn.py

@@ -13,13 +13,12 @@
 
 import six
 
-from heat.tests import common
-
 from heat.common import exception
 from heat.engine.cfn import functions as cfn_funcs
 from heat.engine.hot import functions as hot_funcs
 from heat.engine import properties
 from heat.engine import rsrc_defn
+from heat.tests import common
 
 
 class ResourceDefinitionTest(common.HeatTestCase):

heat/tests/test_server.py

@@ -13,13 +13,13 @@
 
 import collections
 import copy
-from oslo.utils import uuidutils
-import six
-from six.moves.urllib import parse as urlparse
 
 import mock
 import mox
 from novaclient import exceptions as nova_exceptions
+from oslo.utils import uuidutils
+import six
+from six.moves.urllib import parse as urlparse
 
 from heat.common import exception
 from heat.common.i18n import _

heat/tests/test_software_deployment.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+
 import mock
 import six
 

heat/tests/test_sqlalchemy_api.py

@@ -13,12 +13,12 @@
 
 import datetime
 import json
-import six
 import uuid
 
 import mock
 import mox
 from oslo.utils import timeutils
+import six
 
 from heat.common import context
 from heat.common import exception

heat/tests/test_stack_resource.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import uuid
 
 import mock
+import six
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/test_stack_user.py

@@ -11,9 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from keystoneclient import exceptions as kc_exceptions
+import six
 
 from heat.common import exception
 from heat.common import short_id

heat/tests/test_wsgi.py

@@ -16,9 +16,9 @@
 
 
 import json
-import six
 
 from oslo.config import cfg
+import six
 import stubout
 import webob
 

heat/tests/v1_1/fakes.py

@@ -15,11 +15,10 @@
 # limitations under the License.
 
 import mock
-import requests
-
 from novaclient import client as base_client
 from novaclient import exceptions as nova_exceptions
 from novaclient.v1_1 import client
+import requests
 from six.moves.urllib import parse as urlparse
 
 from heat.tests import fakes

heat_integrationtests/common/remote_client.py

@@ -12,13 +12,14 @@
 
 import cStringIO
 import logging
-import paramiko
 import re
 import select
-import six
 import socket
 import time
 
+import paramiko
+import six
+
 from heat_integrationtests.common import exceptions
 
 LOG = logging.getLogger(__name__)

heat_integrationtests/common/test.py

@@ -10,19 +10,19 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import fixtures
 import logging
 import os
 import random
 import re
-import six
 import subprocess
-import testscenarios
-import testtools
 import time
 
+import fixtures
 from heatclient import exc as heat_exceptions
 from oslo.utils import timeutils
+import six
+import testscenarios
+import testtools
 
 from heat_integrationtests.common import clients
 from heat_integrationtests.common import config

heat_integrationtests/functional/test_remote_stack.py

@@ -11,10 +11,11 @@
 #    under the License.
 
 import logging
+
+from heatclient import exc
 import six
 
 from heat_integrationtests.common import test
-from heatclient import exc
 
 LOG = logging.getLogger(__name__)
 

heat_integrationtests/functional/test_resource_group.py

@@ -10,9 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from heatclient import exc
+import six
 
 from heat_integrationtests.common import test
 

heat_integrationtests/functional/test_template_resource.py

@@ -12,6 +12,7 @@
 
 import json
 import logging
+
 import yaml
 
 from heat_integrationtests.common import test

heat_integrationtests/scenario/test_volumes.py

@@ -11,10 +11,10 @@
 #    under the License.
 
 import logging
-import six
-from testtools import testcase
 
 from cinderclient import exceptions as cinder_exceptions
+import six
+from testtools import testcase
 
 from heat_integrationtests.common import exceptions
 from heat_integrationtests.common import test

tox.ini

@@ -52,13 +52,11 @@ commands = python setup.py build_sphinx
 commands = oslo-config-generator --config-file=config-generator.conf
 
 [flake8]
-# H305 imports not grouped correctly
-# H307 like imports should be grouped togethe
 # H404 multi line docstring should start with a summary
 # H405 multi line docstring summary not separated with an empty line
 # H803 no full stop at the end of the commit message
 # H904 Wrap long lines in parentheses instead of a backslash
-ignore = H305,H307,H404,H405,H803,H904
+ignore = H404,H405,H803,H904
 show-source = true
 exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,tools,build
 max-complexity=20