encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-04 01:04:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move django.contrib.auth import out of compat."

Browse Source 
This reverts commit d4d9cc1d53.
This commit is contained in:
Xavier Ordoquy 2017-11-06 15:23:54 +01:00
parent d4d9cc1d53
commit 7d0fa02dc0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rest_framework/compat.py
View File

@ -11,6 +11,7 @@ import inspect
import django
from django.apps import apps
from django.conf import settings
from django.contrib.auth import views
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.validators import \
MaxLengthValidator as DjangoMaxLengthValidator
@ -333,3 +334,11 @@ def authenticate(request=None, **credentials):
else:
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()

11
rest_framework/urls.py
View File

@ -15,17 +15,8 @@ and you should make sure your authentication settings include `SessionAuthentica
from __future__ import unicode_literals
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'
urlpatterns = [