Removed more code related to Django <= 1.8

Author: Ross Mechanic

simple_history/admin.py

@@ -1,25 +1,19 @@
 from __future__ import unicode_literals
 
 from django import http
-from django.core.exceptions import PermissionDenied
+from django.conf import settings
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.admin import helpers
+from django.contrib.admin.utils import unquote
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
-from django.utils.text import capfirst
+from django.utils.encoding import force_text
 from django.utils.html import mark_safe
+from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
-from django.utils.encoding import force_text
-from django.conf import settings
-from django.contrib.admin.utils 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))
@@ -80,8 +74,6 @@ def history_view(self, request, object_id, extra_context=None):
         }
         context.update(extra_context or {})
         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):
@@ -185,8 +177,6 @@ def history_form_view(self, request, object_id, version_id):
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
         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):

simple_history/tests/models.py

@@ -1,19 +1,15 @@
 from __future__ import unicode_literals
 
+from django.apps import apps
 from django.db import models
-from django import VERSION
 
-from simple_history.models import HistoricalRecords
 from simple_history import register
-
+from simple_history.models import HistoricalRecords
 from .custom_user.models import CustomUser as User
-
-from django.apps import apps
+from .external.models.model1 import AbstractExternal
 
 get_model = apps.get_model
 
-from .external.models.model1 import AbstractExternal
-
 
 class Poll(models.Model):
     question = models.CharField(max_length=200)
@@ -85,6 +81,7 @@ def verbose_str(self):
         extra_fields['__str__'] = verbose_str
         return extra_fields
 
+
 register(Voter, records_class=HistoricalRecordsVerbose)
 
 

simple_history/tests/tests/test_admin.py

@@ -1,29 +1,25 @@
 from datetime import datetime, timedelta
 
-from mock import patch, ANY
-from django_webtest import WebTest
+from django.conf import settings
 from django.contrib.admin import AdminSite
 from django.contrib.admin.utils import quote
+from django.contrib.auth import get_user_model
 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
-from django.conf import settings
-from django.contrib.auth import get_user_model
+from django.test.client import RequestFactory
+from django.test.utils import override_settings
 from django.utils.encoding import force_text
+from django_webtest import WebTest
+from mock import ANY, patch
 
+from simple_history.admin import SimpleHistoryAdmin
 from simple_history.models import HistoricalRecords
-from simple_history.admin import SimpleHistoryAdmin, get_complete_version
-from ..models import Book, Person, Poll, State, Employee, Choice, ConcreteExternal
+from ..models import Book, Choice, ConcreteExternal, Employee, Person, Poll, State
 
 User = get_user_model()
 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
@@ -437,7 +433,7 @@ def test_history_form_view_without_getting_history(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history(self):
         request = RequestFactory().post('/')
@@ -492,7 +488,7 @@ def test_history_form_view_getting_history(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history_with_setting_off(self):
         request = RequestFactory().post('/')
@@ -546,7 +542,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history_abstract_external(self):
         request = RequestFactory().post('/')
@@ -601,4 +597,4 @@ def test_history_form_view_getting_history_abstract_external(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)