Skip to content

Commit 7d0fa02

Browse files
committed
Revert "Move django.contrib.auth import out of compat."
This reverts commit d4d9cc1.
1 parent d4d9cc1 commit 7d0fa02

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

rest_framework/compat.py

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

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: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,8 @@
1515
from __future__ import unicode_literals
1616

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

19+
from rest_framework.compat import login, login_kwargs, logout
2920

3021
app_name = 'rest_framework'
3122
urlpatterns = [

0 commit comments

Comments
 (0)