Merge "Enable H306"

27 files changed, 53 insertions, 32 deletions

diff --git a/cinderclient/tests/unit/fixture_data/availability_zones.py b/cinderclient/tests/unit/fixture_data/availability_zones.py
index f1140a7..6f197ce 100644
--- a/cinderclient/tests/unit/fixture_data/availability_zones.py
+++ b/cinderclient/tests/unit/fixture_data/availability_zones.py
@@ -11,6 +11,7 @@
 # under the License.
 
 from datetime import datetime
+
 from cinderclient.tests.unit.fixture_data import base
 
 # FIXME(jamielennox): use timeutils from oslo
diff --git a/cinderclient/tests/unit/test_api_versions.py b/cinderclient/tests/unit/test_api_versions.py
index 5f14c3e..24b09d0 100644
--- a/cinderclient/tests/unit/test_api_versions.py
+++ b/cinderclient/tests/unit/test_api_versions.py
@@ -21,8 +21,9 @@ from cinderclient import api_versions
 from cinderclient import client as base_client
 from cinderclient import exceptions
 from cinderclient.v3 import client
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit import test_utils
+from cinderclient.tests.unit import utils
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/test_base.py b/cinderclient/tests/unit/test_base.py
index d4dd517..99bb29e 100644
--- a/cinderclient/tests/unit/test_base.py
+++ b/cinderclient/tests/unit/test_base.py
@@ -19,11 +19,12 @@ import six
 from cinderclient import api_versions
 from cinderclient.apiclient import base as common_base
 from cinderclient import base
-from cinderclient.v3 import client
 from cinderclient import exceptions
+from cinderclient.v3 import client
 from cinderclient.v3 import volumes
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit import test_utils
+from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
 
diff --git a/cinderclient/tests/unit/test_client.py b/cinderclient/tests/unit/test_client.py
index 5697039..4b341b2 100644
--- a/cinderclient/tests/unit/test_client.py
+++ b/cinderclient/tests/unit/test_client.py
@@ -22,12 +22,13 @@ import mock
 from oslo_serialization import jsonutils
 import six
 
-import cinderclient.client
-import cinderclient.v1.client
-import cinderclient.v2.client
 from cinderclient import api_versions
+import cinderclient.client
 from cinderclient import exceptions
 from cinderclient import utils
+import cinderclient.v1.client
+import cinderclient.v2.client
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
 
diff --git a/cinderclient/tests/unit/test_utils.py b/cinderclient/tests/unit/test_utils.py
index 7f39f06..2847d2c 100644
--- a/cinderclient/tests/unit/test_utils.py
+++ b/cinderclient/tests/unit/test_utils.py
@@ -16,15 +16,16 @@ import ddt
 import sys
 
 import mock
-from six import moves
 import six
+from six import moves
 
 from cinderclient import api_versions
 from cinderclient.apiclient import base as common_base
+from cinderclient import base
 from cinderclient import exceptions
 from cinderclient import shell_utils
 from cinderclient import utils
-from cinderclient import base
+
 from cinderclient.tests.unit import utils as test_utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v1/test_auth.py b/cinderclient/tests/unit/v1/test_auth.py
index 7e5b901..29f8cc3 100644
--- a/cinderclient/tests/unit/v1/test_auth.py
+++ b/cinderclient/tests/unit/v1/test_auth.py
@@ -16,8 +16,9 @@ import mock
 
 import requests
 
-from cinderclient.v1 import client
 from cinderclient import exceptions
+from cinderclient.v1 import client
+
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v1/test_availability_zone.py b/cinderclient/tests/unit/v1/test_availability_zone.py
index 667b89f..7e4c439 100644
--- a/cinderclient/tests/unit/v1/test_availability_zone.py
+++ b/cinderclient/tests/unit/v1/test_availability_zone.py
@@ -18,8 +18,9 @@ import six
 
 from cinderclient.v1 import availability_zones
 from cinderclient.v1 import shell
-from cinderclient.tests.unit.fixture_data import client
+
 from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v1/test_shell.py b/cinderclient/tests/unit/v1/test_shell.py
index 7aa0045..3f4d771 100644
--- a/cinderclient/tests/unit/v1/test_shell.py
+++ b/cinderclient/tests/unit/v1/test_shell.py
@@ -23,9 +23,10 @@ from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
 from cinderclient.v1 import shell as shell_v1
-from cinderclient.tests.unit.v1 import fakes
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit.fixture_data import keystone_client
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 
 @mock.patch.object(client, 'Client', fakes.FakeClient)
diff --git a/cinderclient/tests/unit/v1/test_snapshot_actions.py b/cinderclient/tests/unit/v1/test_snapshot_actions.py
index 46d31b2..2b04028 100644
--- a/cinderclient/tests/unit/v1/test_snapshot_actions.py
+++ b/cinderclient/tests/unit/v1/test_snapshot_actions.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit.fixture_data import snapshots
+from cinderclient.tests.unit import utils
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):
diff --git a/cinderclient/tests/unit/v1/test_types.py b/cinderclient/tests/unit/v1/test_types.py
index 4c799ec..6f1b0c2 100644
--- a/cinderclient/tests/unit/v1/test_types.py
+++ b/cinderclient/tests/unit/v1/test_types.py
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 from cinderclient.v1 import volume_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v1/test_volume_encryption_types.py b/cinderclient/tests/unit/v1/test_volume_encryption_types.py
index e6fad93..48554b0 100644
--- a/cinderclient/tests/unit/v1/test_volume_encryption_types.py
+++ b/cinderclient/tests/unit/v1/test_volume_encryption_types.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v1.volume_encryption_types import VolumeEncryptionType
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
index 03f3546..4603bca 100644
--- a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
+++ b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
@@ -16,6 +16,7 @@
 
 from cinderclient import extension
 from cinderclient.v2.contrib import list_extensions
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_auth.py b/cinderclient/tests/unit/v2/test_auth.py
index 4caf2eb..50c72a3 100644
--- a/cinderclient/tests/unit/v2/test_auth.py
+++ b/cinderclient/tests/unit/v2/test_auth.py
@@ -21,6 +21,7 @@ import requests
 
 from cinderclient import exceptions
 from cinderclient.v2 import client
+
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v2/test_availability_zone.py b/cinderclient/tests/unit/v2/test_availability_zone.py
index ea4c2ef..8c2e1eb 100644
--- a/cinderclient/tests/unit/v2/test_availability_zone.py
+++ b/cinderclient/tests/unit/v2/test_availability_zone.py
@@ -18,8 +18,9 @@ import six
 
 from cinderclient.v2 import availability_zones
 from cinderclient.v2 import shell
-from cinderclient.tests.unit.fixture_data import client
+
 from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v2/test_capabilities.py b/cinderclient/tests/unit/v2/test_capabilities.py
index be6aecd..0437cc0 100644
--- a/cinderclient/tests/unit/v2/test_capabilities.py
+++ b/cinderclient/tests/unit/v2/test_capabilities.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v2.capabilities import Capabilities
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_pools.py b/cinderclient/tests/unit/v2/test_pools.py
index 9ab9049..543e316 100644
--- a/cinderclient/tests/unit/v2/test_pools.py
+++ b/cinderclient/tests/unit/v2/test_pools.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v2.pools import Pool
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py
index 8886311..d692f52 100644
--- a/cinderclient/tests/unit/v2/test_shell.py
+++ b/cinderclient/tests/unit/v2/test_shell.py
@@ -13,21 +13,22 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ddt
 import fixtures
 import mock
-import ddt
 from requests_mock.contrib import fixture as requests_mock_fixture
 from six.moves.urllib import parse
 
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
-from cinderclient.v2 import volumes
-from cinderclient.v2 import volume_backups
 from cinderclient.v2 import shell as test_shell
+from cinderclient.v2 import volume_backups
+from cinderclient.v2 import volumes
+
+from cinderclient.tests.unit.fixture_data import keystone_client
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
-from cinderclient.tests.unit.fixture_data import keystone_client
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/v2/test_snapshot_actions.py b/cinderclient/tests/unit/v2/test_snapshot_actions.py
index 5fa3bd4..61fd0d0 100644
--- a/cinderclient/tests/unit/v2/test_snapshot_actions.py
+++ b/cinderclient/tests/unit/v2/test_snapshot_actions.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit.fixture_data import snapshots
+from cinderclient.tests.unit import utils
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):
diff --git a/cinderclient/tests/unit/v2/test_type_access.py b/cinderclient/tests/unit/v2/test_type_access.py
index 99a859c..35a4480 100644
--- a/cinderclient/tests/unit/v2/test_type_access.py
+++ b/cinderclient/tests/unit/v2/test_type_access.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinderclient.v2 import volume_type_access
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_types.py b/cinderclient/tests/unit/v2/test_types.py
index 0cb8981..9ba13a9 100644
--- a/cinderclient/tests/unit/v2/test_types.py
+++ b/cinderclient/tests/unit/v2/test_types.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinderclient.v2 import volume_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_volume_encryption_types.py b/cinderclient/tests/unit/v2/test_volume_encryption_types.py
index 193fad8..1bbf537 100644
--- a/cinderclient/tests/unit/v2/test_volume_encryption_types.py
+++ b/cinderclient/tests/unit/v2/test_volume_encryption_types.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.v2.volume_encryption_types import VolumeEncryptionType
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
+from cinderclient.v2.volume_encryption_types import VolumeEncryptionType
 
 cs = fakes.FakeClient()
 
diff --git a/cinderclient/tests/unit/v3/fakes.py b/cinderclient/tests/unit/v3/fakes.py
index 04c5aa0..da240f3 100644
--- a/cinderclient/tests/unit/v3/fakes.py
+++ b/cinderclient/tests/unit/v3/fakes.py
@@ -14,8 +14,9 @@
 
 from datetime import datetime
 
-from cinderclient.tests.unit import fakes
 from cinderclient.v3 import client
+
+from cinderclient.tests.unit import fakes
 from cinderclient.tests.unit.v2 import fakes as fake_v2
 
 
diff --git a/cinderclient/tests/unit/v3/test_group_types.py b/cinderclient/tests/unit/v3/test_group_types.py
index 7918bf1..5833c3f 100644
--- a/cinderclient/tests/unit/v3/test_group_types.py
+++ b/cinderclient/tests/unit/v3/test_group_types.py
@@ -17,6 +17,7 @@
 from cinderclient import api_versions
 from cinderclient import exceptions as exc
 from cinderclient.v3 import group_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
 
diff --git a/cinderclient/tests/unit/v3/test_services.py b/cinderclient/tests/unit/v3/test_services.py
index 92f7903..14d8940 100644
--- a/cinderclient/tests/unit/v3/test_services.py
+++ b/cinderclient/tests/unit/v3/test_services.py
@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from cinderclient import api_versions
+from cinderclient.v3 import services
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.v3 import services
-from cinderclient import api_versions
 
 
 class ServicesTest(utils.TestCase):
diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py
index 9221af8..a7be695 100644
--- a/cinderclient/tests/unit/v3/test_shell.py
+++ b/cinderclient/tests/unit/v3/test_shell.py
@@ -43,20 +43,20 @@ import fixtures
 import mock
 from requests_mock.contrib import fixture as requests_mock_fixture
 import six
-import cinderclient
+from six.moves.urllib import parse
 
+import cinderclient
+from cinderclient import base
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
 from cinderclient import utils as cinderclient_utils
-from cinderclient import base
-from cinderclient.v3 import volumes
 from cinderclient.v3 import volume_snapshots
+from cinderclient.v3 import volumes
+
+from cinderclient.tests.unit.fixture_data import keystone_client
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.tests.unit.fixture_data import keystone_client
-
-from six.moves.urllib import parse
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/v3/test_volume_backups.py b/cinderclient/tests/unit/v3/test_volume_backups.py
index 52e843f..faa0185 100644
--- a/cinderclient/tests/unit/v3/test_volume_backups.py
+++ b/cinderclient/tests/unit/v3/test_volume_backups.py
@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
-from cinderclient.tests.unit.v3 import fakes
 from cinderclient import api_versions
 from cinderclient import exceptions as exc
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v3 import fakes
 
 
 class VolumesTest(utils.TestCase):
diff --git a/cinderclient/tests/unit/v3/test_volumes.py b/cinderclient/tests/unit/v3/test_volumes.py
index 72ef916..ff75700 100644
--- a/cinderclient/tests/unit/v3/test_volumes.py
+++ b/cinderclient/tests/unit/v3/test_volumes.py
@@ -21,8 +21,8 @@ from cinderclient import api_versions
 from cinderclient import exceptions
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.v3 import volumes
 from cinderclient.v3 import volume_snapshots
+from cinderclient.v3 import volumes
 
 from six.moves.urllib import parse