Fix version checking for Django < 1.8

Author: macro1

runtests.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import logging
+from os import listdir, unlink
 from os.path import abspath, dirname, join
 from shutil import rmtree
 import sys
@@ -50,6 +51,14 @@
 
 
 def main():
+    # reset the test app migrations
+    for migration_path in [
+        join(dirname(__file__), 'simple_history', 'tests', 'migrations'),
+        join(dirname(__file__), 'simple_history', 'tests', 'migration_test_app', 'migrations'),
+    ]:
+        for migration_file_path in listdir(migration_path):
+            unlink(join(migration_path, migration_file_path))
+
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
     if hasattr(django, 'setup'):

simple_history/admin.py

@@ -18,6 +18,11 @@
     from django.contrib.admin.utils import unquote
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote
+try:
+    from django.utils.version import get_complete_version
+except ImportError:
+    from django import VERSION
+    get_complete_version = lambda: VERSION
 
 USER_NATURAL_KEY = tuple(
     key.lower() for key in settings.AUTH_USER_MODEL.split('.', 1))
@@ -75,7 +80,10 @@ def history_view(self, request, object_id, extra_context=None):
             'admin_user_view': admin_user_view
         }
         context.update(extra_context or {})
-        return render(request, self.object_history_template, context)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        return render(request, self.object_history_template, context, **extra_kwargs)
 
     def response_change(self, request, obj):
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
@@ -177,7 +185,10 @@ def history_form_view(self, request, object_id, version_id):
             'save_on_top': self.save_on_top,
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
-        return render(request, self.object_history_form_template, context)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        return render(request, self.object_history_form_template, context, **extra_kwargs)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/tests/tests/test_admin.py

@@ -6,7 +6,6 @@
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.test.utils import override_settings
 from django.test.client import RequestFactory
-from django import VERSION
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.utils.encoding import force_text
@@ -22,13 +21,17 @@
     from django.contrib.admin.util import quote
 
 from simple_history.models import HistoricalRecords
-from simple_history.admin import SimpleHistoryAdmin
+from simple_history.admin import SimpleHistoryAdmin, get_complete_version
 from ..models import Book, Person, Poll, State, Employee
 
 
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
 
+extra_kwargs = {}
+if get_complete_version() < (1, 8):
+    extra_kwargs = {'current_app': 'admin'}
+
 
 def get_history_url(obj, history_index=None, site="admin"):
     app, model = obj._meta.app_label, obj._meta.model_name
@@ -107,12 +110,8 @@ def test_history_form(self):
         response.form['pub_date_0'] = "2021-01-02"
         response = response.form.submit()
         self.assertEqual(response.status_code, 302)
-        if VERSION < (1, 4, 0):
-            self.assertTrue(response.headers['location']
-                            .endswith(get_history_url(poll)))
-        else:
-            self.assertTrue(response.headers['location']
-                            .endswith(reverse('admin:tests_poll_changelist')))
+        self.assertTrue(response.headers['location']
+                        .endswith(reverse('admin:tests_poll_changelist')))
 
         # Ensure form for second version is correct
         response = self.app.get(get_history_url(poll, 1))
@@ -424,9 +423,8 @@ def test_history_form_view_without_getting_history(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
-
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context)
+            request, admin.object_history_form_template, context, **extra_kwargs)
 
     def test_history_form_view_getting_history(self):
         request = RequestFactory().post('/')
@@ -480,9 +478,8 @@ def test_history_form_view_getting_history(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
-
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context)
+            request, admin.object_history_form_template, context, **extra_kwargs)
 
     def test_history_form_view_getting_history_with_setting_off(self):
         request = RequestFactory().post('/')
@@ -535,6 +532,5 @@ def test_history_form_view_getting_history_with_setting_off(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
-
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context)
+            request, admin.object_history_form_template, context, **extra_kwargs)