Merge "Enable H306"

cinderclient/api_versions.py

@@ -19,9 +19,9 @@ import re
 
 from oslo_utils import strutils
 
+from cinderclient._i18n import _
 from cinderclient import exceptions
 from cinderclient import utils
-from cinderclient._i18n import _
 
 LOG = logging.getLogger(__name__)
 

cinderclient/client.py

@@ -32,8 +32,8 @@ import six
 
 from keystoneauth1 import access
 from keystoneauth1 import adapter
-from keystoneauth1.identity import base
 from keystoneauth1 import discover
+from keystoneauth1.identity import base
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 from oslo_utils import strutils
@@ -42,10 +42,10 @@ import requests
 from six.moves import urllib
 import six.moves.urllib.parse as urlparse
 
+from cinderclient._i18n import _
 from cinderclient import api_versions
 from cinderclient import exceptions
 import cinderclient.extension
-from cinderclient._i18n import _
 
 try:
     from eventlet import sleep

cinderclient/shell.py

@@ -44,6 +44,8 @@ from cinderclient import api_versions
 from cinderclient import client
 from cinderclient import exceptions as exc
 from cinderclient import utils
+
+
 # Enable i18n lazy translation
 _i18n.enable_lazy()
 

cinderclient/shell_utils.py

@@ -17,8 +17,8 @@ from __future__ import print_function
 import sys
 import time
 
-from cinderclient import utils
 from cinderclient import exceptions
+from cinderclient import utils
 
 _quota_resources = ['volumes', 'snapshots', 'gigabytes',
                     'backups', 'backup_gigabytes',

cinderclient/tests/functional/test_volume_create_cli.py

@@ -12,8 +12,8 @@
 
 import unittest
 
-import six
 import ddt
+import six
 
 from tempest.lib import exceptions
 

cinderclient/tests/functional/test_volume_extend_cli.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import ddt
+import six
 
 from tempest.lib import exceptions
 

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

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

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
 
 

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
 

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
 

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
 
 

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
 
 

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)

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):

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
 

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
 

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
 

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
 
 

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
 
 

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
 

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
 

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

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):

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
 

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
 

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()
 

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
 
 

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
 

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):

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

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):

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
 

cinderclient/utils.py

@@ -20,9 +20,9 @@ import pkg_resources
 import sys
 import uuid
 
+import prettytable
 import six
 from six.moves.urllib import parse
-import prettytable
 
 from cinderclient import exceptions
 from oslo_utils import encodeutils

cinderclient/v1/client.py

@@ -20,13 +20,13 @@ from cinderclient.v1 import qos_specs
 from cinderclient.v1 import quota_classes
 from cinderclient.v1 import quotas
 from cinderclient.v1 import services
-from cinderclient.v1 import volumes
-from cinderclient.v1 import volume_snapshots
-from cinderclient.v1 import volume_types
-from cinderclient.v1 import volume_encryption_types
 from cinderclient.v1 import volume_backups
 from cinderclient.v1 import volume_backups_restore
+from cinderclient.v1 import volume_encryption_types
+from cinderclient.v1 import volume_snapshots
 from cinderclient.v1 import volume_transfers
+from cinderclient.v1 import volume_types
+from cinderclient.v1 import volumes
 
 
 class Client(object):

cinderclient/v2/client.py

@@ -15,26 +15,26 @@
 
 import logging
 
-from cinderclient import client
 from cinderclient import api_versions
+from cinderclient import client
 from cinderclient.v2 import availability_zones
+from cinderclient.v2 import capabilities
 from cinderclient.v2 import cgsnapshots
 from cinderclient.v2 import consistencygroups
-from cinderclient.v2 import capabilities
 from cinderclient.v2 import limits
 from cinderclient.v2 import pools
 from cinderclient.v2 import qos_specs
 from cinderclient.v2 import quota_classes
 from cinderclient.v2 import quotas
 from cinderclient.v2 import services
-from cinderclient.v2 import volumes
-from cinderclient.v2 import volume_snapshots
-from cinderclient.v2 import volume_types
-from cinderclient.v2 import volume_type_access
-from cinderclient.v2 import volume_encryption_types
 from cinderclient.v2 import volume_backups
 from cinderclient.v2 import volume_backups_restore
+from cinderclient.v2 import volume_encryption_types
+from cinderclient.v2 import volume_snapshots
 from cinderclient.v2 import volume_transfers
+from cinderclient.v2 import volume_type_access
+from cinderclient.v2 import volume_types
+from cinderclient.v2 import volumes
 
 
 class Client(object):

cinderclient/v3/client.py

@@ -15,17 +15,17 @@
 
 import logging
 
-from cinderclient import client
 from cinderclient import api_versions
+from cinderclient import client
 from cinderclient.v3 import attachments
 from cinderclient.v3 import availability_zones
+from cinderclient.v3 import capabilities
 from cinderclient.v3 import cgsnapshots
 from cinderclient.v3 import clusters
 from cinderclient.v3 import consistencygroups
-from cinderclient.v3 import capabilities
-from cinderclient.v3 import groups
 from cinderclient.v3 import group_snapshots
 from cinderclient.v3 import group_types
+from cinderclient.v3 import groups
 from cinderclient.v3 import limits
 from cinderclient.v3 import messages
 from cinderclient.v3 import pools
@@ -34,14 +34,14 @@ from cinderclient.v3 import quota_classes
 from cinderclient.v3 import quotas
 from cinderclient.v3 import resource_filters
 from cinderclient.v3 import services
-from cinderclient.v3 import volumes
-from cinderclient.v3 import volume_snapshots
-from cinderclient.v3 import volume_types
-from cinderclient.v3 import volume_type_access
-from cinderclient.v3 import volume_encryption_types
 from cinderclient.v3 import volume_backups
 from cinderclient.v3 import volume_backups_restore
+from cinderclient.v3 import volume_encryption_types
+from cinderclient.v3 import volume_snapshots
 from cinderclient.v3 import volume_transfers
+from cinderclient.v3 import volume_type_access
+from cinderclient.v3 import volume_types
+from cinderclient.v3 import volumes
 
 
 class Client(object):

cinderclient/v3/group_snapshots.py

@@ -16,8 +16,8 @@
 """group snapshot interface (v3)."""
 
 
-from cinderclient.apiclient import base as common_base
 from cinderclient import api_versions
+from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient import utils
 

cinderclient/v3/groups.py

@@ -17,8 +17,8 @@
 from six.moves.urllib import parse
 
 from cinderclient import api_versions
-from cinderclient import base
 from cinderclient.apiclient import base as common_base
+from cinderclient import base
 from cinderclient import utils
 
 

cinderclient/v3/messages.py

@@ -12,8 +12,8 @@
 
 """Message interface (v3 extension)."""
 
-from cinderclient import base
 from cinderclient import api_versions
+from cinderclient import base
 
 
 class Message(base.Resource):

cinderclient/v3/resource_filters.py

@@ -12,8 +12,8 @@
 
 """Resource filters interface."""
 
-from cinderclient import base
 from cinderclient import api_versions
+from cinderclient import base
 
 
 class ResourceFilter(base.Resource):

cinderclient/v3/volumes.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 """Volume interface (v3 extension)."""
-from cinderclient.apiclient import base as common_base
 from cinderclient import api_versions
+from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient.v2 import volumes
 

tox.ini

@@ -57,5 +57,5 @@ passenv = OS_*
 
 [flake8]
 show-source = True
-ignore = F811,F821,H306,H404,H405,E122,E123,E128,E251
+ignore = F811,F821,H404,H405,E122,E123,E128,E251
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build