Merge "Fix and enable gating on H306"

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:

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
 
 

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

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
 

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
 
 

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
 

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
 

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__),

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
 

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
 
 

tox.ini

@@ -33,9 +33,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