summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2017-07-08 21:11:49 +0000
committerAkihiro Motoki <amotoki@gmail.com>2017-07-08 23:19:23 +0000
commit28144e9a2f771762103b5e692c5c9d30f095e647 (patch)
tree87ec33f194112f5fbf79d9ad33c939f3ae40320f
parentc15dfe5acd58efa0c5c27dd19de5d4ef2a880c36 (diff)
downloaddjango_openstack_auth-28144e9a2f771762103b5e692c5c9d30f095e647.tar.gz
hacking: Drop import_exceptions from tox.ini
Current hacking check actually does not check attribute-level imports. We can safely drop import_exceptions from tox.ini. Also drops noqa to guard import exceptions from the same reason. Change-Id: I4e37931a7bfb0aa7867d027125ffcf66e414cf08
-rw-r--r--openstack_auth/backend.py2
-rw-r--r--openstack_auth/forms.py4
-rw-r--r--openstack_auth/models.py5
-rw-r--r--openstack_auth/plugin/__init__.py8
-rw-r--r--openstack_auth/tests/tests.py2
-rw-r--r--openstack_auth/views.py12
-rw-r--r--tox.ini10
7 files changed, 18 insertions, 25 deletions
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py
index bc1d345..dae603a 100644
--- a/openstack_auth/backend.py
+++ b/openstack_auth/backend.py
@@ -18,7 +18,7 @@ import logging
import pytz
from django.conf import settings
-from django.utils.module_loading import import_string # noqa
+from django.utils.module_loading import import_string
from django.utils.translation import ugettext_lazy as _
from openstack_auth import exceptions
diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py
index bacc9c0..c7d0c51 100644
--- a/openstack_auth/forms.py
+++ b/openstack_auth/forms.py
@@ -15,11 +15,11 @@ import collections
import logging
from django.conf import settings
-from django.contrib.auth import authenticate # noqa
+from django.contrib.auth import authenticate
from django.contrib.auth import forms as django_auth_forms
from django import forms
from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables # noqa
+from django.views.decorators.debug import sensitive_variables
from openstack_auth import exceptions
from openstack_auth import utils
diff --git a/openstack_auth/models.py b/openstack_auth/models.py
index 76cfc2a..7316aac 100644
--- a/openstack_auth/models.py
+++ b/openstack_auth/models.py
@@ -12,4 +12,7 @@
# limitations under the License.
# import the User model in here so Django can find it
-from openstack_auth.user import User # noqa
+from openstack_auth.user import User
+
+
+__all__ = ['User']
diff --git a/openstack_auth/plugin/__init__.py b/openstack_auth/plugin/__init__.py
index c664bed..75e5e85 100644
--- a/openstack_auth/plugin/__init__.py
+++ b/openstack_auth/plugin/__init__.py
@@ -10,10 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
-from openstack_auth.plugin.base import * # noqa
-from openstack_auth.plugin.password import * # noqa
-from openstack_auth.plugin.token import * # noqa
-from openstack_auth.plugin.k2k import * # noqa
+from openstack_auth.plugin.base import BasePlugin
+from openstack_auth.plugin.k2k import K2KAuthPlugin
+from openstack_auth.plugin.password import PasswordPlugin
+from openstack_auth.plugin.token import TokenPlugin
__all__ = ['BasePlugin',
diff --git a/openstack_auth/tests/tests.py b/openstack_auth/tests/tests.py
index 80e5a88..fcd864f 100644
--- a/openstack_auth/tests/tests.py
+++ b/openstack_auth/tests/tests.py
@@ -29,7 +29,7 @@ from keystoneclient.v2_0 import client as client_v2
from keystoneclient.v3 import client as client_v3
import mock
from mox3 import mox
-from testscenarios import load_tests_apply_scenarios # noqa
+from testscenarios import load_tests_apply_scenarios
from openstack_auth import policy
from openstack_auth.tests import data_v2
diff --git a/openstack_auth/views.py b/openstack_auth/views.py
index e02ff70..7ae3063 100644
--- a/openstack_auth/views.py
+++ b/openstack_auth/views.py
@@ -14,7 +14,7 @@ import logging
from django.conf import settings
from django.contrib import auth
-from django.contrib.auth.decorators import login_required # noqa
+from django.contrib.auth.decorators import login_required
from django.contrib.auth import views as django_auth_views
from django.contrib import messages
from django import http as django_http
@@ -22,10 +22,10 @@ from django import shortcuts
from django.utils import functional
from django.utils import http
from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.cache import never_cache # noqa
-from django.views.decorators.csrf import csrf_exempt # noqa
-from django.views.decorators.csrf import csrf_protect # noqa
-from django.views.decorators.debug import sensitive_post_parameters # noqa
+from django.views.decorators.cache import never_cache
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.csrf import csrf_protect
+from django.views.decorators.debug import sensitive_post_parameters
from keystoneauth1 import exceptions as keystone_exceptions
import six
@@ -36,7 +36,7 @@ from openstack_auth import plugin
# This is historic and is added back in to not break older versions of
# Horizon, fix to Horizon to remove this requirement was committed in
# Juno
-from openstack_auth.forms import Login # noqa
+from openstack_auth.forms import Login # noqa:F401
from openstack_auth import user as auth_user
from openstack_auth import utils
diff --git a/tox.ini b/tox.ini
index ff65dc5..6e48a2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,13 +62,3 @@ commands = python setup.py build_sphinx
[flake8]
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
-
-[hacking]
-import_exceptions = django.conf.settings,
- django.core.urlresolvers.reverse,
- django.conf.urls.include,
- django.conf.urls.patterns,
- django.conf.urls.url,
- django.utils.translation.pgettext_lazy,
- django.utils.translation.ugettext_lazy,
- django.utils.translation.ungettext_lazy,