Merge "Enables H306 pep8 rules"

novaclient/client.py

@@ -31,9 +31,9 @@ except ImportError:
     import simplejson as json
 
 from novaclient import exceptions
+from novaclient.openstack.common.py3kcompat import urlutils
 from novaclient import service_catalog
 from novaclient import utils
-from novaclient.openstack.common.py3kcompat import urlutils
 
 
 class HTTPClient(object):

novaclient/tests/test_auth_plugins.py

@@ -25,8 +25,8 @@ except ImportError:
 
 from novaclient import auth_plugin
 from novaclient import exceptions
-from novaclient.v1_1 import client
 from novaclient.tests import utils
+from novaclient.v1_1 import client
 
 
 def mock_http_request(resp=None):

novaclient/tests/test_base.py

@@ -13,9 +13,9 @@
 
 from novaclient import base
 from novaclient import exceptions
-from novaclient.v1_1 import flavors
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import flavors
 
 
 cs = fakes.FakeClient()

novaclient/tests/test_client.py

@@ -20,9 +20,9 @@ import requests
 import novaclient.client
 import novaclient.extension
 import novaclient.tests.fakes as fakes
+from novaclient.tests import utils
 import novaclient.v1_1.client
 import novaclient.v3.client
-from novaclient.tests import utils
 
 import json
 

novaclient/tests/test_discover.py

@@ -13,9 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import imp
 import inspect
+
+import mock
 import pkg_resources
 
 import novaclient.shell

novaclient/tests/test_utils.py

@@ -16,10 +16,10 @@ import sys
 import mock
 import six
 
-from novaclient import exceptions
-from novaclient import utils
 from novaclient import base
+from novaclient import exceptions
 from novaclient.tests import utils as test_utils
+from novaclient import utils
 
 UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
 

novaclient/tests/v1_1/contrib/fakes.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from novaclient.v1_1 import client
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import client
 
 
 class FakeClient(fakes.FakeClient):

novaclient/tests/v1_1/fakes.py

@@ -20,8 +20,8 @@ import six
 
 from novaclient import client as base_client
 from novaclient import exceptions
-from novaclient.openstack.common import strutils
 from novaclient.openstack.common.py3kcompat import urlutils
+from novaclient.openstack.common import strutils
 from novaclient.tests import fakes
 from novaclient.tests import utils
 from novaclient.v1_1 import client

novaclient/tests/v1_1/test_agents.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import agents
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import agents
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_aggregates.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import aggregates
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import aggregates
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_auth.py

@@ -13,13 +13,13 @@
 
 import copy
 import json
-import mock
 
+import mock
 import requests
 
-from novaclient.v1_1 import client
 from novaclient import exceptions
 from novaclient.tests import utils
+from novaclient.v1_1 import client
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):

novaclient/tests/v1_1/test_availability_zone.py

@@ -16,10 +16,10 @@
 
 import six
 
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 from novaclient.v1_1 import availability_zones
 from novaclient.v1_1 import shell
-from novaclient.tests.v1_1 import fakes
-from novaclient.tests import utils
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_certs.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import certs
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import certs
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_cloudpipe.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import cloudpipe
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import cloudpipe
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_fixed_ips.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 
 cs = fakes.FakeClient()
 

novaclient/tests/v1_1/test_flavor_access.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import flavor_access
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import flavor_access
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_flavors.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from novaclient import exceptions
-from novaclient.v1_1 import flavors
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import flavors
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_floating_ip_dns.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import floating_ip_dns
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import floating_ip_dns
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_floating_ip_pools.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import floating_ip_pools
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import floating_ip_pools
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_floating_ips.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import floating_ips
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import floating_ips
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_floating_ips_bulk.py

@@ -14,9 +14,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 novaclient.v1_1 import floating_ips_bulk
+
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import floating_ips_bulk
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_fping.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import fping
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import fping
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_hosts.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import hosts
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import hosts
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_images.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import images
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import images
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_keypairs.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import keypairs
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import keypairs
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_limits.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import limits
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import limits
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_networks.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import networks
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import networks
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_security_group_rules.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 from novaclient import exceptions
-from novaclient.v1_1 import security_group_rules
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import security_group_rules
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_security_groups.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import security_groups
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import security_groups
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_servers.py

@@ -16,9 +16,9 @@ import mock
 import six
 
 from novaclient import exceptions
-from novaclient.v1_1 import servers
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import servers
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_services.py

@@ -15,9 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import services
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import services
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_shell.py

@@ -19,17 +19,17 @@
 import base64
 import datetime
 import os
-import mock
 
 import fixtures
+import mock
 import six
 
 import novaclient.client
 from novaclient import exceptions
 from novaclient.openstack.common import timeutils
 import novaclient.shell
-from novaclient.tests.v1_1 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
 import novaclient.v1_1.shell
 
 

novaclient/tests/v1_1/test_usage.py

@@ -13,9 +13,9 @@
 
 import datetime
 
-from novaclient.v1_1 import usage
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import usage
 
 
 cs = fakes.FakeClient()

novaclient/tests/v1_1/test_volumes.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v1_1 import volumes
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1 import volumes
 
 
 cs = fakes.FakeClient()

novaclient/tests/v3/fakes.py

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from novaclient.v3 import client
 from novaclient.tests import fakes
 from novaclient.tests.v1_1 import fakes as fakes_v1_1
+from novaclient.v3 import client
 
 
 class FakeClient(fakes.FakeClient, client.Client):

novaclient/tests/v3/test_hosts.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from novaclient.v3 import hosts
-from novaclient.tests.v3 import fakes
 from novaclient.tests import utils
+from novaclient.tests.v3 import fakes
+from novaclient.v3 import hosts
 
 
 cs = fakes.FakeClient()

novaclient/v1_1/client.py

@@ -16,16 +16,18 @@
 
 from novaclient import client
 from novaclient.v1_1 import agents
-from novaclient.v1_1 import certs
-from novaclient.v1_1 import cloudpipe
 from novaclient.v1_1 import aggregates
 from novaclient.v1_1 import availability_zones
+from novaclient.v1_1 import certs
+from novaclient.v1_1 import cloudpipe
 from novaclient.v1_1 import coverage_ext
-from novaclient.v1_1 import flavors
+from novaclient.v1_1 import fixed_ips
 from novaclient.v1_1 import flavor_access
+from novaclient.v1_1 import flavors
 from novaclient.v1_1 import floating_ip_dns
-from novaclient.v1_1 import floating_ips
 from novaclient.v1_1 import floating_ip_pools
+from novaclient.v1_1 import floating_ips
+from novaclient.v1_1 import floating_ips_bulk
 from novaclient.v1_1 import fping
 from novaclient.v1_1 import hosts
 from novaclient.v1_1 import hypervisors
@@ -38,14 +40,12 @@ from novaclient.v1_1 import quotas
 from novaclient.v1_1 import security_group_rules
 from novaclient.v1_1 import security_groups
 from novaclient.v1_1 import servers
+from novaclient.v1_1 import services
 from novaclient.v1_1 import usage
 from novaclient.v1_1 import virtual_interfaces
-from novaclient.v1_1 import volumes
 from novaclient.v1_1 import volume_snapshots
 from novaclient.v1_1 import volume_types
-from novaclient.v1_1 import services
-from novaclient.v1_1 import fixed_ips
-from novaclient.v1_1 import floating_ips_bulk
+from novaclient.v1_1 import volumes
 
 
 class Client(object):

novaclient/v1_1/flavors.py

@@ -17,8 +17,8 @@ Flavor interface.
 """
 from novaclient import base
 from novaclient import exceptions
-from novaclient import utils
 from novaclient.openstack.common.py3kcompat import urlutils
+from novaclient import utils
 
 
 class Flavor(base.Resource):

tox.ini

@@ -28,6 +28,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 downloadcache = ~/cache/pip
 
 [flake8]
-ignore = E12,F841,F811,F821,H302,H306,H403,H404
+ignore = E12,F841,F811,F821,H302,H403,H404
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build