Merge "Rearrange imports"

os_win/_utils.py

@@ -14,18 +14,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
-import six
 import time
 import types
 
 import eventlet
 from eventlet import tpool
+import netaddr
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import reflection
+import six
 
 from os_win._i18n import _LE
 

os_win/tests/unit/utils/compute/test_livemigrationutils.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ddt
-
-import mock
 import platform
 
+import ddt
+import mock
+
 from os_win import exceptions
 from os_win.tests.unit import test_base
 from os_win.utils import _wqlutils

os_win/tests/unit/utils/compute/test_migrationutils.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import ddt
-
 import mock
 
 from os_win import constants

os_win/tests/unit/utils/compute/test_vmutils.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import ddt
-
 import mock
 from six.moves import range  # noqa
 

os_win/tests/unit/utils/io/test_ioutils.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.import mock
 
+import os
+
 import mock
 from oslotest import base
-
-import os
 import six
 
 from os_win import constants

os_win/tests/unit/utils/io/test_namedpipe.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import errno
+
 import mock
 from oslotest import base
 from six.moves import builtins

os_win/tests/unit/utils/storage/initiator/test_fc_utils.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import ctypes
+
 import mock
 from oslotest import base
 import six

os_win/utils/io/ioutils.py

@@ -15,13 +15,13 @@
 
 import ctypes
 import os
-import six
 import struct
 import sys
 
 from eventlet import patcher
 from oslo_log import log as logging
 from oslo_utils import units
+import six
 
 from os_win import _utils
 from os_win import constants

os_win/utils/storage/initiator/fc_utils.py

@@ -15,11 +15,11 @@
 
 import contextlib
 import ctypes
-import six
 import sys
 import textwrap
 
 from oslo_log import log as logging
+import six
 
 from os_win._i18n import _, _LW
 from os_win import _utils