Enabled hacking checks H305 and H307

* H305  imports not grouped correctly
* H307  like imports should be grouped together

Change-Id: I08dafc4fa150d2213b2bb002da7c9ee0ee517fac

oslo/messaging/_cmd/zmq_receiver.py

@@ -22,7 +22,6 @@ import logging
 import sys
 
 from oslo.config import cfg
-
 from oslo.messaging._drivers import impl_zmq
 from oslo.messaging._executors import impl_eventlet  # FIXME(markmc)
 

oslo/messaging/_drivers/amqp.py

@@ -28,9 +28,9 @@ import logging
 import threading
 import uuid
 
-from oslo.config import cfg
 import six
 
+from oslo.config import cfg
 from oslo.messaging._drivers import common as rpc_common
 from oslo.messaging._drivers import pool
 

oslo/messaging/_drivers/common.py

@@ -20,9 +20,9 @@ import logging
 import sys
 import traceback
 
-from oslo import messaging
 import six
 
+from oslo import messaging
 from oslo.messaging import _utils as utils
 from oslo.messaging.openstack.common import importutils
 from oslo.messaging.openstack.common import jsonutils

oslo/messaging/_drivers/impl_qpid.py

@@ -19,9 +19,9 @@ import logging
 import random
 import time
 
-from oslo.config import cfg
 import six
 
+from oslo.config import cfg
 from oslo.messaging._drivers import amqp as rpc_amqp
 from oslo.messaging._drivers import amqpdriver
 from oslo.messaging._drivers import common as rpc_common

oslo/messaging/_drivers/impl_rabbit.py

@@ -25,9 +25,9 @@ import kombu
 import kombu.connection
 import kombu.entity
 import kombu.messaging
-from oslo.config import cfg
 import six
 
+from oslo.config import cfg
 from oslo.messaging._drivers import amqp as rpc_amqp
 from oslo.messaging._drivers import amqpdriver
 from oslo.messaging._drivers import common as rpc_common

oslo/messaging/_drivers/impl_zmq.py

@@ -25,10 +25,10 @@ import uuid
 
 import eventlet
 import greenlet
-from oslo.config import cfg
 import six
 from six import moves
 
+from oslo.config import cfg
 from oslo.messaging._drivers import base
 from oslo.messaging._drivers import common as rpc_common
 from oslo.messaging._executors import impl_eventlet  # FIXME(markmc)

oslo/messaging/_drivers/matchmaker.py

@@ -20,6 +20,7 @@ import contextlib
 import logging
 
 import eventlet
+
 from oslo.config import cfg
 
 # FIXME(markmc): remove this

oslo/messaging/_drivers/matchmaker_redis.py

@@ -17,7 +17,6 @@ return keys for direct exchanges, per (approximate) AMQP parlance.
 """
 
 from oslo.config import cfg
-
 from oslo.messaging._drivers import matchmaker as mm_common
 from oslo.messaging.openstack.common import importutils
 

oslo/messaging/_drivers/matchmaker_ring.py

@@ -21,7 +21,6 @@ import json
 import logging
 
 from oslo.config import cfg
-
 from oslo.messaging._drivers import matchmaker as mm
 
 # FIXME(markmc): remove this

oslo/messaging/_executors/impl_eventlet.py

@@ -20,7 +20,6 @@ from eventlet import greenpool
 import greenlet
 
 from oslo.config import cfg
-
 from oslo.messaging._executors import base
 from oslo.messaging.openstack.common import excutils
 

oslo/messaging/notify/_impl_routing.py

@@ -16,11 +16,11 @@
 import fnmatch
 import logging
 
-from oslo.config import cfg
 import six
 from stevedore import dispatch
 import yaml
 
+from oslo.config import cfg
 from oslo.messaging.notify import notifier
 from oslo.messaging.openstack.common.gettextutils import _  # noqa
 

oslo/messaging/notify/logger.py

@@ -17,7 +17,6 @@ Driver for the Python logging package that sends log records as a notification.
 import logging
 
 from oslo.config import cfg
-
 from oslo.messaging.notify import notifier
 from oslo.messaging import transport
 

oslo/messaging/notify/notifier.py

@@ -19,10 +19,10 @@ import abc
 import logging
 import uuid
 
-from oslo.config import cfg
 import six
 from stevedore import named
 
+from oslo.config import cfg
 from oslo.messaging.openstack.common import timeutils
 from oslo.messaging import serializer as msg_serializer
 

oslo/messaging/rpc/client.py

@@ -23,9 +23,9 @@ __all__ = [
     'RemoteError',
 ]
 
-from oslo.config import cfg
 import six
 
+from oslo.config import cfg
 from oslo.messaging._drivers import base as driver_base
 from oslo.messaging import _utils as utils
 from oslo.messaging import exceptions

oslo/messaging/transport.py

@@ -27,11 +27,11 @@ __all__ = [
     'set_transport_defaults',
 ]
 
-from oslo.config import cfg
 import six
 from six.moves.urllib import parse
 from stevedore import driver
 
+from oslo.config import cfg
 from oslo.messaging import exceptions
 
 

tests/executors/test_executor.py

@@ -15,9 +15,9 @@
 #    under the License.
 
 import contextlib
-import eventlet
 import threading
 
+import eventlet
 import mock
 import testscenarios
 

tests/notify/test_listener.py

@@ -16,9 +16,9 @@
 import threading
 
 import mock
-from oslo.config import cfg
 import testscenarios
 
+from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging.notify import dispatcher
 from tests import utils as test_utils

tests/notify/test_log_handler.py

@@ -11,6 +11,7 @@
 # under the License.
 
 import logging
+
 import mock
 
 from oslo import messaging

tests/rpc/test_client.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
 import testscenarios
 
+from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging import serializer as msg_serializer
 from tests import utils as test_utils

tests/rpc/test_server.py

@@ -15,9 +15,9 @@
 
 import threading
 
-from oslo.config import cfg
 import testscenarios
 
+from oslo.config import cfg
 from oslo import messaging
 from tests import utils as test_utils
 

tests/test_expected_exceptions.py

@@ -15,7 +15,6 @@
 #    under the License.
 
 from oslo import messaging
-
 from tests import utils as test_utils
 
 

tests/test_transport.py

@@ -15,11 +15,11 @@
 
 import fixtures
 from mox3 import mox
-from oslo.config import cfg
 import six
 from stevedore import driver
 import testscenarios
 
+from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging import transport
 from tests import utils as test_utils

tests/utils.py

@@ -19,9 +19,10 @@
 
 """Common utilities used in testing"""
 
-from oslo.config import cfg
 import six
 
+from oslo.config import cfg
+
 from oslotest import base
 from oslotest import moxstubout
 

tox.ini

@@ -25,7 +25,7 @@ commands = python setup.py build_sphinx
 
 [flake8]
 show-source = True
-ignore = E226,E241,E265,E714,H237,H305,H307,H402,H405,H904
+ignore = E226,E241,E265,E714,H237,H402,H405,H904
 exclude = .tox,dist,doc,*.egg,build,__init__.py
 builtins = _