Support Django 2.0

accountsplus/admin.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.core.exceptions
 import django.shortcuts
 import django.http
@@ -21,8 +19,8 @@
 from django.conf import settings
 from django.apps import apps
 
-import signals
-import models
+from accountsplus import signals
+from accountsplus import models
 
 
 sensitive_post_parameters_m = django.utils.decorators.method_decorator(
@@ -185,7 +183,7 @@ def reset_passwords(self, request, queryset):
     reset_passwords.short_description = 'Send password reset emails to selected Users'
 
     def get_timezone(self, obj):
-        return unicode(obj.timezone)
+        return str(obj.timezone)
 
     def masquerade(self, obj):
         return '<a href="{}">sign in</a>'.format(django.urls.reverse('masquerade', kwargs={'user_id': obj.id}))

accountsplus/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

accountsplus/context_processors.py

@@ -1,8 +1,5 @@
-from __future__ import unicode_literals
-
-
 def masquerade_info(request):
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return {
             'is_masquerading': request.session.get('is_masquerading', False),
         }

accountsplus/forms.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.forms
 from django.conf import settings
 from django.apps import apps

accountsplus/middleware.py

@@ -1,11 +1,10 @@
-from __future__ import unicode_literals
 import django.utils.timezone
 from django.utils.deprecation import MiddlewareMixin
 
 
 class TimezoneMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        if request.user.is_authenticated() and request.user.timezone:
+        if request.user.is_authenticated and request.user.timezone:
             django.utils.timezone.activate(request.user.timezone)
         else:
             django.utils.timezone.deactivate()

accountsplus/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.utils.translation import ugettext_lazy as _
@@ -176,4 +174,4 @@ def delete(self, using=None, keep_parents=False):
 
     @property
     def is_masquerading(self):
-        return self.masquerading_user_id > 0
+        return self.masquerading_user_id is not None and self.masquerading_user_id > 0

accountsplus/signals.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.contrib.auth.signals
 from django.dispatch import receiver, Signal
 from django.conf import settings

accountsplus/templatetags/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

accountsplus/tests/test_admin.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.contrib.admin
 

accountsplus/tests/test_models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.core.mail
 import django.db.models

accountsplus/tests/test_signals.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.test.utils
 

accountsplus/tests/test_urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.shortcuts
 import django.conf.urls

accountsplus/tests/test_views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.test.utils
 import django.test.client

accountsplus/urls.py

@@ -1,30 +1,29 @@
-from __future__ import unicode_literals
-
 import django.conf.urls
-from django.contrib.auth.urls import url
+import django.contrib.auth.urls
 import django.contrib.auth.views
 
-import views
-import forms
+
+from accountsplus import views
+from accountsplus import forms
 
 urlpatterns = [
-    url(r'^logout/$', views.logout_then_login, name='logout'),
-    url(r'^password_change/$', views.password_change, name='password_change'),
-    url(r'^password_reset/$', views.password_reset, name='password_reset'),
-    url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
-        django.contrib.auth.views.password_reset_confirm, name='password_reset_confirm'),
+    django.conf.urls.url(r'^logout/$', views.logout_then_login, name='logout'),
+    django.conf.urls.url(r'^password_change/$', views.password_change, name='password_change'),
+    django.conf.urls.url(r'^password_reset/$', django.contrib.auth.views.PasswordResetView.as_view(), name='password_reset'),
+    django.conf.urls.url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
+        django.contrib.auth.views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'),
 
     # override the admin password reset flow to use the normal site password
     # reset flow
-    url(r'^password_reset/$', views.password_reset, name='admin_password_reset'),
+    django.conf.urls.url(r'^password_reset/$', views.password_reset, name='admin_password_reset'),
 
-    url(r'^login/$',
-        django.contrib.auth.views.login,
+    django.conf.urls.url(r'^login/$',
+        django.contrib.auth.views.LoginView.as_view(),
         kwargs={'authentication_form': forms.EmailBasedAuthenticationForm, 'redirect_authenticated_user': True},
         name='login'),
-    url(r'^', django.conf.urls.include(django.contrib.auth.urls)),
+    django.conf.urls.url(r'^', django.conf.urls.include(django.contrib.auth.urls)),
 
     # masquerade views
-    url(r'^admin/masquerade/end/$', views.end_masquerade, name='end_masquerade'),
-    url(r'^admin/masquerade/(?P<user_id>\d+)/$', views.masquerade, name='masquerade'),
+    django.conf.urls.url(r'^admin/masquerade/end/$', views.end_masquerade, name='end_masquerade'),
+    django.conf.urls.url(r'^admin/masquerade/(?P<user_id>\d+)/$', views.masquerade, name='masquerade'),
 ]

accountsplus/views.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import logging
 
 from django.utils.translation import ugettext as _
@@ -14,28 +13,28 @@
 import django.http
 import django.template.response
 import django.utils.module_loading
-import django.core.urlresolvers
+import django.urls
 from django.conf import settings as app_settings
 
 from axes import utils
 
-import signals
-import forms
-import settings
+from accountsplus import signals
+from accountsplus import forms
+from accountsplus import settings
 
 
 logger = logging.getLogger(__name__)
 
 
-def logout_then_login(request, login_url=None,  extra_context=None):
+def logout_then_login(request, login_url=None):
     """
     Logs out the user if they are logged in. Then redirects to the log-in page.
     """
     # if a user is masquerading, don't log them out, just kill the masquerade
     if request.session.get('is_masquerading'):
         return django.shortcuts.redirect('end_masquerade')
     else:
-        return django.contrib.auth.views.logout_then_login(request, login_url, extra_context)
+        return django.contrib.auth.views.logout_then_login(request, login_url)
 
 
 @django.views.decorators.cache.never_cache
@@ -130,7 +129,7 @@ def password_change(request,
                     PasswordChangeForm,
                     current_app=None, extra_context=None):
     if post_change_redirect is None:
-        post_change_redirect = django.core.urlresolvers.reverse(
+        post_change_redirect = django.urls.reverse(
             'password_change_done')
     else:
         post_change_redirect = django.shortcuts.resolve_url(
@@ -173,7 +172,7 @@ def password_reset(request,
                    extra_email_context=None):
     User = django.contrib.auth.get_user_model()
 
-    response = django.contrib.auth.views.password_reset(
+    response = django.contrib.auth.views.PasswordResetView(
         request, template_name, email_template_name,
         subject_template_name, password_reset_form, token_generator,
         post_reset_redirect, from_email, extra_context,

requirements.txt

@@ -1,5 +1,5 @@
 setuptools
-Django==1.10.1
+Django==2.2.1
 flake8
 pep8
 pyflakes

settings_test.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import os
 
 

urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.conf.urls
 import django.contrib.admin