15 files changed, 10 insertions, 14 deletions
diff --git a/oslo/messaging/_cmd/zmq_receiver.py b/oslo/messaging/_cmd/zmq_receiver.py
index ae0713d..2521ae4 100644
--- a/oslo/messaging/_cmd/zmq_receiver.py
+++ b/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)
 
diff --git a/oslo/messaging/_drivers/amqp.py b/oslo/messaging/_drivers/amqp.py
index 59fec2b..f008379 100644
--- a/oslo/messaging/_drivers/amqp.py
+++ b/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
 
diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py
index dd2f4ba..83f634b 100644
--- a/oslo/messaging/_drivers/common.py
+++ b/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
diff --git a/oslo/messaging/_drivers/impl_qpid.py b/oslo/messaging/_drivers/impl_qpid.py
index a7e231f..f79fae6 100644
--- a/oslo/messaging/_drivers/impl_qpid.py
+++ b/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
diff --git a/oslo/messaging/_drivers/impl_rabbit.py b/oslo/messaging/_drivers/impl_rabbit.py
index 84f7cbf..2d43e43 100644
--- a/oslo/messaging/_drivers/impl_rabbit.py
+++ b/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
diff --git a/oslo/messaging/_drivers/impl_zmq.py b/oslo/messaging/_drivers/impl_zmq.py
index 84830f3..77975a3 100644
--- a/oslo/messaging/_drivers/impl_zmq.py
+++ b/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)
diff --git a/oslo/messaging/_drivers/matchmaker.py b/oslo/messaging/_drivers/matchmaker.py
index 5ebf566..7aa7956 100644
--- a/oslo/messaging/_drivers/matchmaker.py
+++ b/oslo/messaging/_drivers/matchmaker.py
@@ -20,6 +20,7 @@ import contextlib
 import logging
 
 import eventlet
+
 from oslo.config import cfg
 
 # FIXME(markmc): remove this
diff --git a/oslo/messaging/_drivers/matchmaker_redis.py b/oslo/messaging/_drivers/matchmaker_redis.py
index d489557..812c87c 100644
--- a/oslo/messaging/_drivers/matchmaker_redis.py
+++ b/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
 
diff --git a/oslo/messaging/_drivers/matchmaker_ring.py b/oslo/messaging/_drivers/matchmaker_ring.py
index e3c02b0..40db24b 100644
--- a/oslo/messaging/_drivers/matchmaker_ring.py
+++ b/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
diff --git a/oslo/messaging/_executors/impl_eventlet.py b/oslo/messaging/_executors/impl_eventlet.py
index fb70dff..6281dd9 100644
--- a/oslo/messaging/_executors/impl_eventlet.py
+++ b/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
 
diff --git a/oslo/messaging/notify/_impl_routing.py b/oslo/messaging/notify/_impl_routing.py
index efb1256..50d14ee 100644
--- a/oslo/messaging/notify/_impl_routing.py
+++ b/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
 
diff --git a/oslo/messaging/notify/logger.py b/oslo/messaging/notify/logger.py
index 0f794a6..b1e1e77 100644
--- a/oslo/messaging/notify/logger.py
+++ b/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
 
diff --git a/oslo/messaging/notify/notifier.py b/oslo/messaging/notify/notifier.py
index e15a800..3c2152e 100644
--- a/oslo/messaging/notify/notifier.py
+++ b/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
 
diff --git a/oslo/messaging/rpc/client.py b/oslo/messaging/rpc/client.py
index a140ffe..af34c6b 100644
--- a/oslo/messaging/rpc/client.py
+++ b/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
diff --git a/oslo/messaging/transport.py b/oslo/messaging/transport.py
index e1a4210..9c9844b 100644
--- a/oslo/messaging/transport.py
+++ b/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