Prepare for Django 2.0

simple_history/admin.py

@@ -6,14 +6,17 @@
 from django.contrib import admin
 from django.contrib.admin import helpers
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
 from django.utils.text import capfirst
 from django.utils.html import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.encoding import force_text
 from django.conf import settings
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django < 1.10
+    from django.core.urlresolvers import reverse
 try:
     from django.contrib.admin.utils import unquote
 except ImportError:  # Django < 1.7

simple_history/models.py

@@ -179,7 +179,8 @@ def copy_fields(self, model):
                 if isinstance(old_field.rel.to, str) and old_field.rel.to == 'self':
                     object_to = old_field.model
                 else:
-                    object_to = old_field.rel.to
+                    #           required for Django <= 1.8                       # required for Django >= 2.0
+                    object_to = old_field.rel.to if hasattr(old_field, 'rel') else old_field.remote_field.model
 
                 field = FieldType(
                     object_to,
@@ -284,11 +285,14 @@ def get_history_user(self, instance):
             return instance._history_user
         except AttributeError:
             try:
-                if self.thread.request.user.is_authenticated():
-                    return self.thread.request.user
-                return None
+                is_authenticated = self.thread.request.user.is_authenticated
             except AttributeError:
                 return None
+            if not is_authenticated in (True, False):
+                is_authenticated = is_authenticated() # Django < 1.10
+            if is_authenticated:
+                return self.thread.request.user
+            return None
 
 
 def transform_field(field):

simple_history/registry_tests/migration_test_app/models.py

@@ -11,5 +11,5 @@ class WhatIMean(DoYouKnow):
 
 
 class Yar(models.Model):
-    what = models.ForeignKey(WhatIMean)
+    what = models.ForeignKey(WhatIMean, on_delete=models.CASCADE)
     history = HistoricalRecords()

simple_history/tests/models.py

@@ -287,7 +287,11 @@ class UserAccessorOverride(models.Model):
 
 
 class Employee(models.Model):
-    manager = models.OneToOneField('Employee', null=True)
+    manager = models.OneToOneField(
+        'Employee',
+        on_delete=models.CASCADE,
+        null=True,
+    )
     history = HistoricalRecords()
 
 

simple_history/tests/tests/test_admin.py

@@ -6,7 +6,10 @@
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.test.utils import override_settings
 from django.test.client import RequestFactory
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError: # Django <1.10
+    from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.utils.encoding import force_text

simple_history/tests/urls.py

@@ -1,12 +1,12 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+from django.conf.urls import url
 from django.contrib import admin
 from . import other_admin
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^other-admin/', include(other_admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
+    url(r'^other-admin/', other_admin.site.urls),
 ]