Remove more compatibility code

Author: macro1

runtests.py

@@ -3,7 +3,6 @@
 from os.path import abspath, dirname, join
 from shutil import rmtree
 import sys
-import warnings
 
 import django
 from django.conf import settings
@@ -14,17 +13,21 @@
 rmtree(media_root, ignore_errors=True)
 
 installed_apps = [
+    'simple_history.tests',
+    'simple_history.tests.custom_user',
+    'simple_history.tests.external',
+    'simple_history.tests.migration_test_app',
+
+    'simple_history',
+
     'django.contrib.contenttypes',
     'django.contrib.auth',
     'django.contrib.sessions',
     'django.contrib.admin',
-    'simple_history',
-    'simple_history.tests',
-    'simple_history.tests.external',
-    'simple_history.tests.migration_test_app',
 ]
 
 DEFAULT_SETTINGS = dict(
+    AUTH_USER_MODEL='custom_user.CustomUser',
     ROOT_URLCONF='simple_history.tests.urls',
     MEDIA_ROOT=media_root,
     STATIC_URL='/static/',
@@ -45,9 +48,6 @@
     }],
 )
 
-if django.VERSION >= (1, 5):
-    installed_apps.append('simple_history.tests.custom_user')
-    DEFAULT_SETTINGS['AUTH_USER_MODEL'] = 'custom_user.CustomUser'
 
 def main():
     if not settings.configured:

simple_history/admin.py

@@ -34,10 +34,7 @@ def get_urls(self):
         urls = super(SimpleHistoryAdmin, self).get_urls()
         admin_site = self.admin_site
         opts = self.model._meta
-        try:
-            info = opts.app_label, opts.model_name
-        except AttributeError:  # Django < 1.7
-            info = opts.app_label, opts.module_name
+        info = opts.app_label, opts.model_name
         history_urls = [
             url("^([^/]+)/history/([^/]+)/$",
                 admin_site.admin_view(self.history_form_view),
@@ -146,10 +143,7 @@ def history_form_view(self, request, object_id, version_id):
             model_admin=self,
         )
 
-        try:
-            model_name = original_opts.model_name
-        except AttributeError:  # Django < 1.7
-            model_name = original_opts.module_name
+        model_name = original_opts.model_name
         url_triplet = self.admin_site.name, original_opts.app_label, model_name
         context = {
             'title': _('Revert %s') % force_text(obj),

simple_history/models.py

@@ -170,10 +170,7 @@ def get_extra_fields(self, model, fields):
         def revert_url(self):
             """URL for this change in the default admin site."""
             opts = model._meta
-            try:
-                app_label, model_name = opts.app_label, opts.model_name
-            except AttributeError:  # Django < 1.7
-                app_label, model_name = opts.app_label, opts.module_name
+            app_label, model_name = opts.app_label, opts.model_name
             return ('%s:%s_%s_simple_history' %
                     (admin.site.name, app_label, model_name),
                     [getattr(self, opts.pk.attname), self.history_id])

simple_history/tests/tests/test_admin.py

@@ -31,10 +31,7 @@
 
 
 def get_history_url(obj, history_index=None, site="admin"):
-    try:
-        app, model = obj._meta.app_label, obj._meta.module_name
-    except AttributeError:
-        app, model = obj._meta.app_label, obj._meta.model_name
+    app, model = obj._meta.app_label, obj._meta.model_name
     if history_index is not None:
         history = obj.history.order_by('history_id')[history_index]
         return reverse(
@@ -67,12 +64,8 @@ def login(self, user=None):
         return form.submit()
 
     def test_history_list(self):
-        if VERSION >= (1, 5):
-            try:
-                module_name = self.user._meta.module_name
-            except AttributeError:
-                module_name = self.user._meta.model_name
-            self.assertEqual(module_name, 'customuser')
+        model_name = self.user._meta.model_name
+        self.assertEqual(model_name, 'customuser')
         self.login()
         poll = Poll(question="why?", pub_date=today)
         poll._history_user = self.user