migrated to 3.6

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 . import signals
+from . 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}))
@@ -314,7 +312,7 @@ def queryset(self, request, queryset):
             return queryset
 
     def lookups(self, request, model_admin):
-        return LogEntryAdmin.ACTION_NAMES.items()
+        return list(LogEntryAdmin.ACTION_NAMES.items())
 
 
 @django.contrib.admin.register(django.contrib.admin.models.LogEntry)

accountsplus/apps.py

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

accountsplus/context_processors.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 
 def masquerade_info(request):
     if request.user.is_authenticated():

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,4 +1,3 @@
-from __future__ import unicode_literals
 import django.utils.timezone
 from django.utils.deprecation import MiddlewareMixin
 

accountsplus/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.utils.translation import ugettext_lazy as _

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/tests/test_admin.py

@@ -1,12 +1,9 @@
-from __future__ import unicode_literals
-
-import django.test
 import django.contrib.admin
 
 import logging
 
 from .. import admin
-from test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent, )
+from .test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent, )
 
 
 logging.disable(logging.CRITICAL)

accountsplus/tests/test_context_processors.py

@@ -4,7 +4,7 @@
 import django.test.client
 import django.utils.timezone
 
-from test_models import (UnitTestCompany, UnitTestUser)
+from .test_models import (UnitTestCompany, UnitTestUser)
 
 
 logging.disable(logging.CRITICAL)

accountsplus/tests/test_middleware.py

@@ -7,7 +7,7 @@
 import pytz
 
 from .. import middleware
-from test_models import (UnitTestCompany, UnitTestUser, )
+from .test_models import (UnitTestCompany, UnitTestUser, )
 
 
 logging.disable(logging.CRITICAL)

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
 
@@ -10,7 +8,7 @@
 import accountsplus.signals
 
 from .. import signals, models
-from test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent)
+from .test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent)
 
 logging.disable(logging.CRITICAL)
 

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
@@ -9,8 +7,7 @@
 
 import logging
 
-from test_models import (UnitTestCompany, UnitTestUser)
-import test_admin
+from .test_models import (UnitTestCompany, UnitTestUser)
 
 
 logging.disable(logging.CRITICAL)

accountsplus/urls.py

@@ -1,11 +1,9 @@
-from __future__ import unicode_literals
-
 import django.conf.urls
 from django.contrib.auth.urls import url
 import django.contrib.auth.views
 
-import views
-import forms
+from . import views
+from . import forms
 
 urlpatterns = [
     url(r'^logout/$', views.logout_then_login, name='logout'),

accountsplus/views.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import logging
 
 from django.utils.translation import ugettext as _
@@ -19,9 +18,9 @@
 
 from axes import utils
 
-import signals
-import forms
-import settings
+from . import signals
+from . import forms
+from . import settings
 
 
 logger = logging.getLogger(__name__)

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