From c02446468d29ae9b1deac6eb7cab146905465efc Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Wed, 11 Jan 2017 20:06:33 +0200
Subject: [PATCH] Rearrange imports

The imports should be split into: native, 3rd party, and
project imports. However, there are some cases in which
this isn't true.

Change-Id: I6d1c0c13c8c258c669f78473aecde0d771af38ba
---
 os_win/_utils.py                                           | 4 ++--
 os_win/tests/unit/utils/compute/test_livemigrationutils.py | 6 +++---
 os_win/tests/unit/utils/compute/test_migrationutils.py     | 1 -
 os_win/tests/unit/utils/compute/test_vmutils.py            | 1 -
 os_win/tests/unit/utils/io/test_ioutils.py                 | 4 ++--
 os_win/tests/unit/utils/io/test_namedpipe.py               | 1 +
 os_win/tests/unit/utils/storage/initiator/test_fc_utils.py | 1 +
 os_win/utils/io/ioutils.py                                 | 2 +-
 os_win/utils/storage/initiator/fc_utils.py                 | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/os_win/_utils.py b/os_win/_utils.py
index ffb8a32..c90ea4c 100644
--- a/os_win/_utils.py
+++ b/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
 
diff --git a/os_win/tests/unit/utils/compute/test_livemigrationutils.py b/os_win/tests/unit/utils/compute/test_livemigrationutils.py
index 6bae682..a14c2d8 100644
--- a/os_win/tests/unit/utils/compute/test_livemigrationutils.py
+++ b/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
diff --git a/os_win/tests/unit/utils/compute/test_migrationutils.py b/os_win/tests/unit/utils/compute/test_migrationutils.py
index dbad430..72ee5f2 100644
--- a/os_win/tests/unit/utils/compute/test_migrationutils.py
+++ b/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
diff --git a/os_win/tests/unit/utils/compute/test_vmutils.py b/os_win/tests/unit/utils/compute/test_vmutils.py
index 4e653cb..e27c0a9 100644
--- a/os_win/tests/unit/utils/compute/test_vmutils.py
+++ b/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
 
diff --git a/os_win/tests/unit/utils/io/test_ioutils.py b/os_win/tests/unit/utils/io/test_ioutils.py
index a233c25..ffe2974 100644
--- a/os_win/tests/unit/utils/io/test_ioutils.py
+++ b/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
diff --git a/os_win/tests/unit/utils/io/test_namedpipe.py b/os_win/tests/unit/utils/io/test_namedpipe.py
index 0ef0d49..b322e90 100644
--- a/os_win/tests/unit/utils/io/test_namedpipe.py
+++ b/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
diff --git a/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py b/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py
index bb2b48a..15d05be 100644
--- a/os_win/tests/unit/utils/storage/initiator/test_fc_utils.py
+++ b/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
diff --git a/os_win/utils/io/ioutils.py b/os_win/utils/io/ioutils.py
index 1644267..339d5bf 100644
--- a/os_win/utils/io/ioutils.py
+++ b/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
diff --git a/os_win/utils/storage/initiator/fc_utils.py b/os_win/utils/storage/initiator/fc_utils.py
index 16400cf..37bce54 100644
--- a/os_win/utils/storage/initiator/fc_utils.py
+++ b/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