Merge "hacking: Drop import_exceptions from tox.ini"
This commit is contained in:
commit
c6c8982fc1
|
@ -18,7 +18,7 @@ import logging
|
||||||
import pytz
|
import pytz
|
||||||
|
|
||||||
from django.conf import settings
|
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 django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from openstack_auth import exceptions
|
from openstack_auth import exceptions
|
||||||
|
|
|
@ -15,11 +15,11 @@ import collections
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.conf import settings
|
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.contrib.auth import forms as django_auth_forms
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.utils.translation import ugettext_lazy as _
|
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 exceptions
|
||||||
from openstack_auth import utils
|
from openstack_auth import utils
|
||||||
|
|
|
@ -12,4 +12,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# import the User model in here so Django can find it
|
# 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']
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from openstack_auth.plugin.base import * # noqa
|
from openstack_auth.plugin.base import BasePlugin
|
||||||
from openstack_auth.plugin.password import * # noqa
|
from openstack_auth.plugin.k2k import K2KAuthPlugin
|
||||||
from openstack_auth.plugin.token import * # noqa
|
from openstack_auth.plugin.password import PasswordPlugin
|
||||||
from openstack_auth.plugin.k2k import * # noqa
|
from openstack_auth.plugin.token import TokenPlugin
|
||||||
|
|
||||||
|
|
||||||
__all__ = ['BasePlugin',
|
__all__ = ['BasePlugin',
|
||||||
|
|
|
@ -29,7 +29,7 @@ from keystoneclient.v2_0 import client as client_v2
|
||||||
from keystoneclient.v3 import client as client_v3
|
from keystoneclient.v3 import client as client_v3
|
||||||
import mock
|
import mock
|
||||||
from mox3 import mox
|
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 import policy
|
||||||
from openstack_auth.tests import data_v2
|
from openstack_auth.tests import data_v2
|
||||||
|
|
|
@ -14,7 +14,7 @@ import logging
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import auth
|
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.auth import views as django_auth_views
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django import http as django_http
|
from django import http as django_http
|
||||||
|
@ -22,10 +22,10 @@ from django import shortcuts
|
||||||
from django.utils import functional
|
from django.utils import functional
|
||||||
from django.utils import http
|
from django.utils import http
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.views.decorators.cache import never_cache # noqa
|
from django.views.decorators.cache import never_cache
|
||||||
from django.views.decorators.csrf import csrf_exempt # noqa
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
from django.views.decorators.csrf import csrf_protect # noqa
|
from django.views.decorators.csrf import csrf_protect
|
||||||
from django.views.decorators.debug import sensitive_post_parameters # noqa
|
from django.views.decorators.debug import sensitive_post_parameters
|
||||||
from keystoneauth1 import exceptions as keystone_exceptions
|
from keystoneauth1 import exceptions as keystone_exceptions
|
||||||
import six
|
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
|
# 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
|
# Horizon, fix to Horizon to remove this requirement was committed in
|
||||||
# Juno
|
# 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 user as auth_user
|
||||||
from openstack_auth import utils
|
from openstack_auth import utils
|
||||||
|
|
||||||
|
|
10
tox.ini
10
tox.ini
|
@ -62,13 +62,3 @@ commands = python setup.py build_sphinx
|
||||||
[flake8]
|
[flake8]
|
||||||
builtins = _
|
builtins = _
|
||||||
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
|
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,
|
|
||||||
|
|
Loading…
Reference in New Issue