Fix import order of libraries

Follow the standard order of stdlib,
third party, then project imports.

Change-Id: Icaa8919f5fbab9d6ee7541365eb795b1067ab6ab

os_brick/encryptors/__init__.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from os_brick.encryptors import nop
 
 from oslo_log import log as logging
 from oslo_utils import importutils
 from oslo_utils import strutils
 
+from os_brick.encryptors import nop
+
 LOG = logging.getLogger(__name__)
 
 LUKS = "luks"

os_brick/encryptors/cryptsetup.py

@@ -18,12 +18,13 @@ import array
 import binascii
 import os
 
-from os_brick.encryptors import base
-from os_brick import exception
 from oslo_concurrency import processutils
 from oslo_log import log as logging
 from oslo_log import versionutils
 
+from os_brick.encryptors import base
+from os_brick import exception
+
 LOG = logging.getLogger(__name__)
 
 

os_brick/encryptors/luks.py

@@ -13,11 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from os_brick.encryptors import cryptsetup
-from os_brick.privileged import rootwrap as priv_rootwrap
 from oslo_concurrency import processutils as putils
 from oslo_log import log as logging
 
+from os_brick.encryptors import cryptsetup
+from os_brick.privileged import rootwrap as priv_rootwrap
+
 LOG = logging.getLogger(__name__)
 
 

os_brick/exception.py

@@ -14,12 +14,13 @@
 
 """Exceptions for the Brick library."""
 
-from oslo_concurrency import processutils as putils
 import traceback
 
-from os_brick.i18n import _
+from oslo_concurrency import processutils as putils
 from oslo_log import log as logging
 
+from os_brick.i18n import _
+
 
 LOG = logging.getLogger(__name__)
 

os_brick/initiator/connectors/base.py

@@ -21,7 +21,6 @@ from oslo_log import log as logging
 
 from os_brick import exception
 from os_brick import initiator
-
 from os_brick.initiator import host_driver
 from os_brick.initiator import initiator_connector
 from os_brick.initiator import linuxscsi

os_brick/initiator/connectors/fibre_channel_s390x.py

@@ -15,7 +15,6 @@
 from oslo_log import log as logging
 
 from os_brick import initiator
-
 from os_brick.initiator.connectors import fibre_channel
 from os_brick.initiator import linuxfc
 

os_brick/initiator/connectors/scaleio.py

@@ -14,11 +14,11 @@
 
 import json
 import os
-import requests
 import urllib
 
 from oslo_concurrency import lockutils
 from oslo_log import log as logging
+import requests
 
 from os_brick import exception
 from os_brick.i18n import _

os_brick/initiator/linuxrbd.py

@@ -13,6 +13,7 @@
 """Generic RBD connection utilities."""
 
 import io
+
 from oslo_log import log as logging
 
 from os_brick import exception

os_brick/local_dev/lvm.py

@@ -19,13 +19,14 @@ import math
 import os
 import re
 
+from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
+from oslo_utils import excutils
+
 from os_brick import exception
 from os_brick import executor
 from os_brick.privileged import rootwrap as priv_rootwrap
 from os_brick import utils
-from oslo_concurrency import processutils as putils
-from oslo_log import log as logging
-from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 

os_brick/remotefs/windows_remotefs.py

@@ -18,9 +18,8 @@
 import os
 import re
 
-from oslo_log import log as logging
-
 from os_win import utilsfactory
+from oslo_log import log as logging
 
 from os_brick import exception
 from os_brick.i18n import _

os_brick/tests/base.py

@@ -15,11 +15,11 @@
 
 import logging
 import os
-import testtools
 from unittest import mock
 
 import fixtures
 from oslo_utils import strutils
+import testtools
 
 
 class TestCase(testtools.TestCase):

os_brick/tests/caches/test_opencas.py

@@ -12,9 +12,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from oslo_concurrency import processutils as putils
 from unittest import mock
 
+from oslo_concurrency import processutils as putils
+
 from os_brick.caches import opencas
 from os_brick import exception
 from os_brick.tests import base

os_brick/tests/encryptors/test_base.py

@@ -13,9 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from castellan.tests.unit.key_manager import fake
 from unittest import mock
 
+from castellan.tests.unit.key_manager import fake
+
 from os_brick import encryptors
 from os_brick.tests import base
 

os_brick/tests/encryptors/test_cryptsetup.py

@@ -20,10 +20,11 @@ from unittest import mock
 
 from castellan.common.objects import symmetric_key as key
 from castellan.tests.unit.key_manager import fake
+from oslo_concurrency import processutils as putils
+
 from os_brick.encryptors import cryptsetup
 from os_brick import exception
 from os_brick.tests.encryptors import test_base
-from oslo_concurrency import processutils as putils
 
 
 def fake__get_key(context, passphrase):

os_brick/tests/encryptors/test_luks.py

@@ -17,9 +17,10 @@ import binascii
 from unittest import mock
 
 from castellan.common.objects import symmetric_key as key
+from oslo_concurrency import processutils as putils
+
 from os_brick.encryptors import luks
 from os_brick.tests.encryptors import test_cryptsetup
-from oslo_concurrency import processutils as putils
 
 
 class LuksEncryptorTestCase(test_cryptsetup.CryptsetupEncryptorTestCase):

os_brick/tests/initiator/connectors/test_scaleio.py

@@ -13,9 +13,10 @@
 #    under the License.
 import json
 import os
-import requests
 from unittest import mock
 
+import requests
+
 from os_brick import exception
 from os_brick.initiator.connectors import scaleio
 from os_brick.tests.initiator import test_connector

os_brick/tests/windows/test_base_connector.py

@@ -16,6 +16,7 @@
 from unittest import mock
 
 import ddt
+
 from os_brick import exception
 from os_brick.initiator.windows import base as base_win_conn
 from os_brick.tests.windows import fake_win_conn