Move django.contrib.auth import out of compat.

Fixed some regressions where compat was imported during app loading and
led to importing django.contrib.auth.models which ended in a
`AppRegistryNotReady` exception.
This commit is contained in:
Xavier Ordoquy 2017-11-06 15:06:47 +01:00
parent 3dc40f9572
commit c65f8ba382
2 changed files with 11 additions and 10 deletions

View File

@ -11,7 +11,6 @@ import inspect
import django import django
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
from django.contrib.auth import views
from django.core.exceptions import ImproperlyConfigured, ValidationError from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.validators import \ from django.core.validators import \
MaxLengthValidator as DjangoMaxLengthValidator MaxLengthValidator as DjangoMaxLengthValidator
@ -334,11 +333,3 @@ def authenticate(request=None, **credentials):
else: else:
return authenticate(request=request, **credentials) return authenticate(request=request, **credentials)
if django.VERSION < (1, 11):
login = views.login
login_kwargs = {'template_name': 'rest_framework/login.html'}
logout = views.logout
else:
login = views.LoginView.as_view(template_name='rest_framework/login.html')
login_kwargs = {}
logout = views.LogoutView.as_view()

View File

@ -14,9 +14,19 @@ and you should make sure your authentication settings include `SessionAuthentica
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import django
from django.conf.urls import url from django.conf.urls import url
from django.contrib.auth import views
if django.VERSION < (1, 11):
login = views.login
login_kwargs = {'template_name': 'rest_framework/login.html'}
logout = views.logout
else:
login = views.LoginView.as_view(template_name='rest_framework/login.html')
login_kwargs = {}
logout = views.LogoutView.as_view()
from rest_framework.compat import login, login_kwargs, logout
app_name = 'rest_framework' app_name = 'rest_framework'
urlpatterns = [ urlpatterns = [