flake8: fix alphabetical imports and enable H306

Change-Id: I0f4fcc9796e8529e7217dc24abe95660633cad33

keystoneclient/generic/shell.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystoneclient import utils
 from keystoneclient.generic import client
+from keystoneclient import utils
 
 CLIENT_CLASS = client.Client
 

keystoneclient/middleware/auth_token.py

@@ -155,12 +155,12 @@ import time
 import urllib
 import webob.exc
 
-from keystoneclient.openstack.common import jsonutils
 from keystoneclient.common import cms
-from keystoneclient import utils
 from keystoneclient.middleware import memcache_crypt
+from keystoneclient.openstack.common import jsonutils
 from keystoneclient.openstack.common import memorycache
 from keystoneclient.openstack.common import timeutils
+from keystoneclient import utils
 
 CONF = None
 # to pass gate before oslo-config is deployed everywhere,

keystoneclient/shell.py

@@ -28,11 +28,11 @@ import sys
 import keystoneclient
 
 from keystoneclient import access
+from keystoneclient.contrib.bootstrap import shell as shell_bootstrap
 from keystoneclient import exceptions as exc
+from keystoneclient.generic import shell as shell_generic
 from keystoneclient import utils
 from keystoneclient.v2_0 import shell as shell_v2_0
-from keystoneclient.generic import shell as shell_generic
-from keystoneclient.contrib.bootstrap import shell as shell_bootstrap
 
 
 def positive_non_zero_float(argument_value):

keystoneclient/v2_0/shell.py

@@ -19,8 +19,8 @@ import argparse
 import getpass
 import sys
 
-from keystoneclient.v2_0 import client
 from keystoneclient import utils
+from keystoneclient.v2_0 import client
 
 
 CLIENT_CLASS = client.Client

keystoneclient/v3/client.py

@@ -15,8 +15,8 @@
 import json
 import logging
 
-from keystoneclient import exceptions
 from keystoneclient import client
+from keystoneclient import exceptions
 from keystoneclient.v3 import credentials
 from keystoneclient.v3 import domains
 from keystoneclient.v3 import endpoints

tests/test_auth_token_middleware.py

@@ -26,11 +26,11 @@ import fixtures
 import webob
 
 from keystoneclient.common import cms
-from keystoneclient import utils
 from keystoneclient.middleware import auth_token
-from keystoneclient.openstack.common import memorycache
 from keystoneclient.openstack.common import jsonutils
+from keystoneclient.openstack.common import memorycache
 from keystoneclient.openstack.common import timeutils
+from keystoneclient import utils
 
 
 ROOTDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))

tests/test_keyring.py

@@ -3,8 +3,9 @@ import datetime
 from keystoneclient import access
 from keystoneclient import client
 from keystoneclient.openstack.common import timeutils
-from tests.v2_0 import client_fixtures
+
 from tests import utils
+from tests.v2_0 import client_fixtures
 
 try:
     import keyring  # noqa

tests/v2_0/test_auth.py

@@ -4,9 +4,10 @@ import json
 
 import requests
 
-from keystoneclient.v2_0 import client
 from keystoneclient import exceptions
 from keystoneclient.openstack.common import timeutils
+from keystoneclient.v2_0 import client
+
 from tests import utils
 
 

tests/v2_0/test_ec2.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tests/v2_0/test_endpoints.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tests/v2_0/test_roles.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tests/v2_0/test_services.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tests/v2_0/test_shell.py

@@ -2,12 +2,13 @@ import cStringIO
 import os
 import stubout
 import sys
+
 from testtools import matchers
 
 from keystoneclient import client
 
-from tests.v2_0 import fakes
 from tests import utils
+from tests.v2_0 import fakes
 
 
 DEFAULT_USERNAME = 'username'

tests/v2_0/test_tenants.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tests/v2_0/test_users.py

@@ -1,6 +1,6 @@
 import copy
-import urlparse
 import json
+import urlparse
 
 import requests
 

tox.ini

@@ -34,9 +34,8 @@ downloadcache = ~/cache/pip
 # H202: assertRaises Exception too broad
 # H302: import only modules
 # H304: no relative imports
-# H306: imports not in alphabetical order
 # H404: multi line docstring should start with a summary
 # H802: git commit title
-ignore = F811,F821,F841,H201,H202,H302,H304,H306,H404,H802
+ignore = F811,F821,F841,H201,H202,H302,H304,H404,H802
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build