# HG changeset patch # User Gustavo Andres Morero # Date 1533242583 10800 # Thu Aug 02 17:43:03 2018 -0300 # Node ID 1cb871a082773ec3d8c70e881585216a50965be3 # Parent 4d2785002f3ae374ecfc141ae6523f4f5ca7fc2e updates for django 2.1 support. diff --git a/webutils/baseacct/urls.py b/webutils/baseacct/urls.py --- a/webutils/baseacct/urls.py +++ b/webutils/baseacct/urls.py @@ -10,14 +10,14 @@ urlpatterns = [ url(r'^login/$', - auth_views.login, { - 'template_name': 'baseacct/login.html', - 'authentication_form': config.get_login_form(), - }, name='baseacct-login'), + auth_views.LoginView.as_view( + template_name='baseacct/login.html', + authentication_form=config.get_login_form(), + ), name='baseacct-login'), url(r'^logout/$', - auth_views.logout, { - 'template_name': 'baseacct/logout.html', - }, name='baseacct-logout'), + auth_views.LogoutView.as_view( + template_name='baseacct/logout.html', + ), name='baseacct-logout'), url(r'^logout-login/$', auth_views.logout_then_login, {'login_url': config.get_login_url()}, diff --git a/webutils/djtools/auth_backends.py b/webutils/djtools/auth_backends.py --- a/webutils/djtools/auth_backends.py +++ b/webutils/djtools/auth_backends.py @@ -7,7 +7,7 @@ supports_inactive_user = False supports_object_permissions = False - def authenticate(self, username=None, password=None): + def authenticate(self, request, username=None, password=None): if '@' in username: kwargs = {'email__iexact': username} else: