diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py index e852f3c..a03b283 100644 --- a/openstack_auth/forms.py +++ b/openstack_auth/forms.py @@ -13,10 +13,10 @@ import logging -from django import forms from django.conf import settings from django.contrib.auth import authenticate from django.contrib.auth.forms import AuthenticationForm +from django import forms from django.utils.translation import ugettext_lazy as _ from django.views.decorators.debug import sensitive_variables diff --git a/openstack_auth/tests/tests.py b/openstack_auth/tests/tests.py index 35dc70f..55b2954 100644 --- a/openstack_auth/tests/tests.py +++ b/openstack_auth/tests/tests.py @@ -15,10 +15,10 @@ import copy from mox3 import mox -from django import test from django.conf import settings from django.contrib.auth import REDIRECT_FIELD_NAME from django.core.urlresolvers import reverse +from django import test from keystoneclient import exceptions as keystone_exceptions from keystoneclient.v2_0 import client as client_v2 diff --git a/openstack_auth/user.py b/openstack_auth/user.py index 0e61ef9..592b603 100644 --- a/openstack_auth/user.py +++ b/openstack_auth/user.py @@ -14,8 +14,8 @@ import hashlib import logging -from django.contrib.auth.models import AnonymousUser from django.conf import settings +from django.contrib.auth.models import AnonymousUser from keystoneclient import exceptions as keystone_exceptions diff --git a/openstack_auth/utils.py b/openstack_auth/utils.py index c749f42..cfd8523 100644 --- a/openstack_auth/utils.py +++ b/openstack_auth/utils.py @@ -15,8 +15,8 @@ from six.moves.urllib import parse as urlparse from django.conf import settings from django.contrib import auth -from django.contrib.auth.models import AnonymousUser from django.contrib.auth import middleware +from django.contrib.auth.models import AnonymousUser from django.utils import timezone from keystoneclient.v2_0 import client as client_v2 diff --git a/openstack_auth/views.py b/openstack_auth/views.py index 43885e1..31c279b 100644 --- a/openstack_auth/views.py +++ b/openstack_auth/views.py @@ -14,24 +14,24 @@ import logging import django -from django import shortcuts from django.conf import settings -from django.contrib.auth import REDIRECT_FIELD_NAME -from django.contrib.auth.views import (login as django_login, - logout_then_login as django_logout) from django.contrib.auth.decorators import login_required -from django.views.decorators.debug import sensitive_post_parameters +from django.contrib.auth import REDIRECT_FIELD_NAME +from django.contrib.auth.views import login as django_login +from django.contrib.auth.views import logout_then_login as django_logout +from django import shortcuts from django.utils.functional import curry from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_protect +from django.views.decorators.debug import sensitive_post_parameters try: from django.utils.http import is_safe_url except ImportError: from .utils import is_safe_url -from keystoneclient.v2_0 import client as keystone_client_v2 from keystoneclient import exceptions as keystone_exceptions +from keystoneclient.v2_0 import client as keystone_client_v2 from .forms import Login from .user import set_session_from_user, create_user_from_token, Token diff --git a/tox.ini b/tox.ini index 0407aaa..4b922b0 100644 --- a/tox.ini +++ b/tox.ini @@ -36,11 +36,7 @@ downloadcache = ~/cache/pip [flake8] builtins = _ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py -# H201 no 'except:' at least use 'except Exception:' -# H302 import only modules.'from optparse import make_option' does not import a module -# H303 No wildcard (*) import. +# H301 one import per line # H304 No relative imports. 'from .views import IndexView' is a relative import # H4xx docstrings -# H701 empty localization string -# H702 Formatting operation should be outside of localization method call -ignore = H201,H301,H306,H302,H303,H304,H4,H701,H702,H803 +ignore = H301,H304,H4