diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py index b741a16cd..e4a52639a 100644 --- a/keystoneclient/generic/shell.py +++ b/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 diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 4f3fa2616..4f9b637e5 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/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, diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py index fa8437e54..a0c27f8dc 100644 --- a/keystoneclient/shell.py +++ b/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): diff --git a/keystoneclient/v2_0/shell.py b/keystoneclient/v2_0/shell.py index ad192e4ca..8decb6239 100755 --- a/keystoneclient/v2_0/shell.py +++ b/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 diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py index b4c31c6be..fab3b02f7 100644 --- a/keystoneclient/v3/client.py +++ b/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 diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index 8f3960213..6ea16d658 100644 --- a/tests/test_auth_token_middleware.py +++ b/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__))) diff --git a/tests/test_keyring.py b/tests/test_keyring.py index ec4547abc..7af90605f 100644 --- a/tests/test_keyring.py +++ b/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 diff --git a/tests/v2_0/test_auth.py b/tests/v2_0/test_auth.py index 21fa1ed45..537d51e04 100644 --- a/tests/v2_0/test_auth.py +++ b/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 diff --git a/tests/v2_0/test_ec2.py b/tests/v2_0/test_ec2.py index a3ac91ab9..74469c4e9 100644 --- a/tests/v2_0/test_ec2.py +++ b/tests/v2_0/test_ec2.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tests/v2_0/test_endpoints.py b/tests/v2_0/test_endpoints.py index 59fc0630e..ff11e0a6c 100644 --- a/tests/v2_0/test_endpoints.py +++ b/tests/v2_0/test_endpoints.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tests/v2_0/test_roles.py b/tests/v2_0/test_roles.py index f5b4ee4e6..60afe5fee 100644 --- a/tests/v2_0/test_roles.py +++ b/tests/v2_0/test_roles.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tests/v2_0/test_services.py b/tests/v2_0/test_services.py index 8be109a3f..555e91b4a 100644 --- a/tests/v2_0/test_services.py +++ b/tests/v2_0/test_services.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tests/v2_0/test_shell.py b/tests/v2_0/test_shell.py index f097a9c64..d35665c1a 100644 --- a/tests/v2_0/test_shell.py +++ b/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' diff --git a/tests/v2_0/test_tenants.py b/tests/v2_0/test_tenants.py index ed03c9e0b..a5bca526b 100644 --- a/tests/v2_0/test_tenants.py +++ b/tests/v2_0/test_tenants.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tests/v2_0/test_users.py b/tests/v2_0/test_users.py index 35a349f4d..230847016 100644 --- a/tests/v2_0/test_users.py +++ b/tests/v2_0/test_users.py @@ -1,6 +1,6 @@ import copy -import urlparse import json +import urlparse import requests diff --git a/tox.ini b/tox.ini index 093c2ef92..b2fc4d64c 100644 --- a/tox.ini +++ b/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