From 3ecaeb416ed77de4033bf6839208788b9d5f066e Mon Sep 17 00:00:00 2001
From: Sushil Kumar <sushil.kumar2@globallogic.com>
Date: Wed, 11 Dec 2013 17:38:56 +0000
Subject: [PATCH] Enables H306 pep8 rules

Updates tox.ini to reduce ignored rules.

Updates code for H306 violation.

Change-Id: I9beea02510a1122afb55ad3df3b37f770fe05134
---
 novaclient/client.py                             |  2 +-
 novaclient/tests/test_auth_plugins.py            |  2 +-
 novaclient/tests/test_base.py                    |  2 +-
 novaclient/tests/test_client.py                  |  2 +-
 novaclient/tests/test_discover.py                |  3 ++-
 novaclient/tests/test_utils.py                   |  4 ++--
 novaclient/tests/v1_1/contrib/fakes.py           |  2 +-
 novaclient/tests/v1_1/fakes.py                   |  2 +-
 novaclient/tests/v1_1/test_agents.py             |  4 ++--
 novaclient/tests/v1_1/test_aggregates.py         |  2 +-
 novaclient/tests/v1_1/test_auth.py               |  4 ++--
 novaclient/tests/v1_1/test_availability_zone.py  |  4 ++--
 novaclient/tests/v1_1/test_certs.py              |  2 +-
 novaclient/tests/v1_1/test_cloudpipe.py          |  2 +-
 novaclient/tests/v1_1/test_fixed_ips.py          |  2 +-
 novaclient/tests/v1_1/test_flavor_access.py      |  2 +-
 novaclient/tests/v1_1/test_flavors.py            |  2 +-
 novaclient/tests/v1_1/test_floating_ip_dns.py    |  4 ++--
 novaclient/tests/v1_1/test_floating_ip_pools.py  |  2 +-
 novaclient/tests/v1_1/test_floating_ips.py       |  2 +-
 novaclient/tests/v1_1/test_floating_ips_bulk.py  |  3 ++-
 novaclient/tests/v1_1/test_fping.py              |  2 +-
 novaclient/tests/v1_1/test_hosts.py              |  4 ++--
 novaclient/tests/v1_1/test_images.py             |  2 +-
 novaclient/tests/v1_1/test_keypairs.py           |  2 +-
 novaclient/tests/v1_1/test_limits.py             |  2 +-
 novaclient/tests/v1_1/test_networks.py           |  2 +-
 .../tests/v1_1/test_security_group_rules.py      |  2 +-
 novaclient/tests/v1_1/test_security_groups.py    |  2 +-
 novaclient/tests/v1_1/test_servers.py            |  2 +-
 novaclient/tests/v1_1/test_services.py           |  4 ++--
 novaclient/tests/v1_1/test_shell.py              |  4 ++--
 novaclient/tests/v1_1/test_usage.py              |  2 +-
 novaclient/tests/v1_1/test_volumes.py            |  2 +-
 novaclient/tests/v3/fakes.py                     |  2 +-
 novaclient/tests/v3/test_hosts.py                |  4 ++--
 novaclient/v1_1/client.py                        | 16 ++++++++--------
 novaclient/v1_1/flavors.py                       |  2 +-
 tox.ini                                          |  2 +-
 39 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/novaclient/client.py b/novaclient/client.py
index 0cbfa8bdd..3cb18798d 100644
--- a/novaclient/client.py
+++ b/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):
diff --git a/novaclient/tests/test_auth_plugins.py b/novaclient/tests/test_auth_plugins.py
index 96217991a..a08459416 100644
--- a/novaclient/tests/test_auth_plugins.py
+++ b/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):
diff --git a/novaclient/tests/test_base.py b/novaclient/tests/test_base.py
index 6f9ba7c15..717dc6ea5 100644
--- a/novaclient/tests/test_base.py
+++ b/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()
diff --git a/novaclient/tests/test_client.py b/novaclient/tests/test_client.py
index 45c05e459..ded0d9add 100644
--- a/novaclient/tests/test_client.py
+++ b/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
 
diff --git a/novaclient/tests/test_discover.py b/novaclient/tests/test_discover.py
index 29c9e4756..e4acf0be5 100644
--- a/novaclient/tests/test_discover.py
+++ b/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
diff --git a/novaclient/tests/test_utils.py b/novaclient/tests/test_utils.py
index 4400ab010..bc63c95c9 100644
--- a/novaclient/tests/test_utils.py
+++ b/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'
 
diff --git a/novaclient/tests/v1_1/contrib/fakes.py b/novaclient/tests/v1_1/contrib/fakes.py
index 1d679f352..6f4608e82 100644
--- a/novaclient/tests/v1_1/contrib/fakes.py
+++ b/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):
diff --git a/novaclient/tests/v1_1/fakes.py b/novaclient/tests/v1_1/fakes.py
index 6ed88a11d..a6699c0b1 100644
--- a/novaclient/tests/v1_1/fakes.py
+++ b/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
diff --git a/novaclient/tests/v1_1/test_agents.py b/novaclient/tests/v1_1/test_agents.py
index c9eaf3787..222d03153 100644
--- a/novaclient/tests/v1_1/test_agents.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_aggregates.py b/novaclient/tests/v1_1/test_aggregates.py
index bbd7f2c10..3367b9850 100644
--- a/novaclient/tests/v1_1/test_aggregates.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_auth.py b/novaclient/tests/v1_1/test_auth.py
index 0ecfd1e5e..1754f8a2a 100644
--- a/novaclient/tests/v1_1/test_auth.py
+++ b/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):
diff --git a/novaclient/tests/v1_1/test_availability_zone.py b/novaclient/tests/v1_1/test_availability_zone.py
index 93cb6bebf..fe9e885f4 100644
--- a/novaclient/tests/v1_1/test_availability_zone.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_certs.py b/novaclient/tests/v1_1/test_certs.py
index 3d1ca0907..c08ac90ed 100644
--- a/novaclient/tests/v1_1/test_certs.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_cloudpipe.py b/novaclient/tests/v1_1/test_cloudpipe.py
index f98c2b24b..a54aa4f47 100644
--- a/novaclient/tests/v1_1/test_cloudpipe.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_fixed_ips.py b/novaclient/tests/v1_1/test_fixed_ips.py
index 6881d1b40..550784c41 100644
--- a/novaclient/tests/v1_1/test_fixed_ips.py
+++ b/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()
 
diff --git a/novaclient/tests/v1_1/test_flavor_access.py b/novaclient/tests/v1_1/test_flavor_access.py
index aea57a511..1ed58f4f0 100644
--- a/novaclient/tests/v1_1/test_flavor_access.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_flavors.py b/novaclient/tests/v1_1/test_flavors.py
index a50783bdd..c10d925d3 100644
--- a/novaclient/tests/v1_1/test_flavors.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_floating_ip_dns.py b/novaclient/tests/v1_1/test_floating_ip_dns.py
index a5714f4da..25a3a22e3 100644
--- a/novaclient/tests/v1_1/test_floating_ip_dns.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_floating_ip_pools.py b/novaclient/tests/v1_1/test_floating_ip_pools.py
index ba0fcb517..f0d080914 100644
--- a/novaclient/tests/v1_1/test_floating_ip_pools.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_floating_ips.py b/novaclient/tests/v1_1/test_floating_ips.py
index 04088e097..90aaaa208 100644
--- a/novaclient/tests/v1_1/test_floating_ips.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_floating_ips_bulk.py b/novaclient/tests/v1_1/test_floating_ips_bulk.py
index 27acd5c7a..8ad2ac4a8 100644
--- a/novaclient/tests/v1_1/test_floating_ips_bulk.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_fping.py b/novaclient/tests/v1_1/test_fping.py
index 7f240e299..165caf57a 100644
--- a/novaclient/tests/v1_1/test_fping.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_hosts.py b/novaclient/tests/v1_1/test_hosts.py
index cfaeeacca..ce18d960b 100644
--- a/novaclient/tests/v1_1/test_hosts.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_images.py b/novaclient/tests/v1_1/test_images.py
index 33c8adb61..481553a95 100644
--- a/novaclient/tests/v1_1/test_images.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_keypairs.py b/novaclient/tests/v1_1/test_keypairs.py
index 1318bd11d..a6b674228 100644
--- a/novaclient/tests/v1_1/test_keypairs.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_limits.py b/novaclient/tests/v1_1/test_limits.py
index d97300f5f..92c8f7c4c 100644
--- a/novaclient/tests/v1_1/test_limits.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_networks.py b/novaclient/tests/v1_1/test_networks.py
index cba8393fd..f4e973754 100644
--- a/novaclient/tests/v1_1/test_networks.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_security_group_rules.py b/novaclient/tests/v1_1/test_security_group_rules.py
index 02230e9b8..a7259619d 100644
--- a/novaclient/tests/v1_1/test_security_group_rules.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_security_groups.py b/novaclient/tests/v1_1/test_security_groups.py
index ac6e0aa75..c06eaab2a 100644
--- a/novaclient/tests/v1_1/test_security_groups.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_servers.py b/novaclient/tests/v1_1/test_servers.py
index 4861ad2c7..f13fa7577 100644
--- a/novaclient/tests/v1_1/test_servers.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_services.py b/novaclient/tests/v1_1/test_services.py
index ddd43bc8a..85e4f345c 100644
--- a/novaclient/tests/v1_1/test_services.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_shell.py b/novaclient/tests/v1_1/test_shell.py
index c8758cff3..c02dc3dcf 100644
--- a/novaclient/tests/v1_1/test_shell.py
+++ b/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
 
 
diff --git a/novaclient/tests/v1_1/test_usage.py b/novaclient/tests/v1_1/test_usage.py
index 09546966f..01df9fe70 100644
--- a/novaclient/tests/v1_1/test_usage.py
+++ b/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()
diff --git a/novaclient/tests/v1_1/test_volumes.py b/novaclient/tests/v1_1/test_volumes.py
index 131a032d7..6c52f6bbc 100644
--- a/novaclient/tests/v1_1/test_volumes.py
+++ b/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()
diff --git a/novaclient/tests/v3/fakes.py b/novaclient/tests/v3/fakes.py
index a8c3788ab..a3815f5e4 100644
--- a/novaclient/tests/v3/fakes.py
+++ b/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):
diff --git a/novaclient/tests/v3/test_hosts.py b/novaclient/tests/v3/test_hosts.py
index 15bda0e85..ff158b920 100644
--- a/novaclient/tests/v3/test_hosts.py
+++ b/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()
diff --git a/novaclient/v1_1/client.py b/novaclient/v1_1/client.py
index 50ab46cff..247944510 100644
--- a/novaclient/v1_1/client.py
+++ b/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):
diff --git a/novaclient/v1_1/flavors.py b/novaclient/v1_1/flavors.py
index 19a3808cd..28ca2c7b9 100644
--- a/novaclient/v1_1/flavors.py
+++ b/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):
diff --git a/tox.ini b/tox.ini
index 99286c2bd..9ef68cca4 100644
--- a/tox.ini
+++ b/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