Skip to content

Commit d6a8e02

Browse files
xordoquyRyan P Kilby
authored andcommitted
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.
1 parent ca341ef commit d6a8e02

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

rest_framework/compat.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import django
1212
from django.apps import apps
1313
from django.conf import settings
14-
from django.contrib.auth import views
1514
from django.core.exceptions import ImproperlyConfigured, ValidationError
1615
from django.core.validators import \
1716
MaxLengthValidator as DjangoMaxLengthValidator
@@ -334,11 +333,3 @@ def authenticate(request=None, **credentials):
334333
else:
335334
return authenticate(request=request, **credentials)
336335

337-
if django.VERSION < (1, 11):
338-
login = views.login
339-
login_kwargs = {'template_name': 'rest_framework/login.html'}
340-
logout = views.logout
341-
else:
342-
login = views.LoginView.as_view(template_name='rest_framework/login.html')
343-
login_kwargs = {}
344-
logout = views.LogoutView.as_view()

rest_framework/urls.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,19 @@
1414
"""
1515
from __future__ import unicode_literals
1616

17+
import django
1718
from django.conf.urls import url
19+
from django.contrib.auth import views
20+
21+
if django.VERSION < (1, 11):
22+
login = views.login
23+
login_kwargs = {'template_name': 'rest_framework/login.html'}
24+
logout = views.logout
25+
else:
26+
login = views.LoginView.as_view(template_name='rest_framework/login.html')
27+
login_kwargs = {}
28+
logout = views.LogoutView.as_view()
1829

19-
from rest_framework.compat import login, login_kwargs, logout
2030

2131
app_name = 'rest_framework'
2232
urlpatterns = [

0 commit comments

Comments
 (0)