From 9f255a9b495e12d4c7fb78b3f8d8e2159d540f68 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 16 Dec 2013 15:28:05 +0100
Subject: [PATCH] Fix and enable gating on H306

H306 - module imports should be in alphabetical order

Change-Id: I1f8fc25b0e6ca23c21c90bda420f42a45141c2e2
---
 glanceclient/common/http.py    | 2 +-
 glanceclient/shell.py          | 2 +-
 glanceclient/v1/client.py      | 2 +-
 glanceclient/v1/shell.py       | 4 ++--
 glanceclient/v2/client.py      | 2 +-
 tests/test_http.py             | 2 +-
 tests/test_progressbar.py      | 2 +-
 tests/test_ssl.py              | 2 +-
 tests/test_utils.py            | 2 +-
 tests/v1/test_image_members.py | 2 +-
 tox.ini                        | 4 +---
 11 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index 4922b57a..7bc5f9f0 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -37,8 +37,8 @@ if not hasattr(urlparse, 'parse_qsl'):
 
 import OpenSSL
 
-from glanceclient import exc
 from glanceclient.common import utils
+from glanceclient import exc
 from glanceclient.openstack.common import strutils
 
 try:
diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index a9fe429d..8140d35c 100644
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -31,8 +31,8 @@ from keystoneclient.v2_0 import client as ksclient
 import netaddr
 
 import glanceclient
-from glanceclient import exc
 from glanceclient.common import utils
+from glanceclient import exc
 from glanceclient.openstack.common import strutils
 
 
diff --git a/glanceclient/v1/client.py b/glanceclient/v1/client.py
index d28b663f..fdb5f070 100644
--- a/glanceclient/v1/client.py
+++ b/glanceclient/v1/client.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 from glanceclient.common import http
-from glanceclient.v1 import images
 from glanceclient.v1 import image_members
+from glanceclient.v1 import images
 
 
 class Client(http.HTTPClient):
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py
index cf36add9..8cf4b43a 100644
--- a/glanceclient/v1/shell.py
+++ b/glanceclient/v1/shell.py
@@ -19,9 +19,9 @@ import argparse
 import copy
 import sys
 
-from glanceclient import exc
-from glanceclient.common import utils
 from glanceclient.common import progressbar
+from glanceclient.common import utils
+from glanceclient import exc
 from glanceclient.openstack.common import strutils
 import glanceclient.v1.images
 
diff --git a/glanceclient/v2/client.py b/glanceclient/v2/client.py
index 50be984f..baf0bc4a 100644
--- a/glanceclient/v2/client.py
+++ b/glanceclient/v2/client.py
@@ -16,9 +16,9 @@
 import warlock
 
 from glanceclient.common import http
-from glanceclient.v2 import images
 from glanceclient.v2 import image_members
 from glanceclient.v2 import image_tags
+from glanceclient.v2 import images
 from glanceclient.v2 import schemas
 
 
diff --git a/tests/test_http.py b/tests/test_http.py
index 69a7704c..6a745353 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -21,9 +21,9 @@ import urlparse
 import mox
 import testtools
 
-from glanceclient import exc
 import glanceclient
 from glanceclient.common import http
+from glanceclient import exc
 from six.moves import http_client
 from tests import utils
 
diff --git a/tests/test_progressbar.py b/tests/test_progressbar.py
index 7f4ae848..c4fac7c7 100644
--- a/tests/test_progressbar.py
+++ b/tests/test_progressbar.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import sys
 import StringIO
+import sys
 
 import testtools
 
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index aaba67e8..7749b756 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -18,8 +18,8 @@ import os
 from OpenSSL import crypto
 import testtools
 
-from glanceclient import exc
 from glanceclient.common import http
+from glanceclient import exc
 
 
 TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ae72bded..e5d7f191 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import sys
 import StringIO
+import sys
 
 import testtools
 
diff --git a/tests/v1/test_image_members.py b/tests/v1/test_image_members.py
index a0705ad9..31287012 100644
--- a/tests/v1/test_image_members.py
+++ b/tests/v1/test_image_members.py
@@ -15,8 +15,8 @@
 
 import testtools
 
-import glanceclient.v1.images
 import glanceclient.v1.image_members
+import glanceclient.v1.images
 from tests import utils
 
 
diff --git a/tox.ini b/tox.ini
index 9a3f674c..9bab32b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,9 +29,7 @@ downloadcache = ~/cache/pip
 # H233  Python 3.x incompatible use of print operator
 # H302  import only modules
 # H303  no wildcard import
-# H306  imports not in alphabetical orde
 # H404  multi line docstring should start with a summary
-# H501  Do not use locals() for string formatting
-ignore = F403,F841,F812,F821,H233,H302,H303,H306,H404,H501
+ignore = F403,F841,F812,F821,H233,H302,H303,H404
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build