remove compat module entirely

Author: merwok

admin_interface/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
 
-from admin_interface.compat import gettext_lazy as _
 from admin_interface.models import Theme
 
 

admin_interface/apps.py

@@ -1,7 +1,6 @@
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
-
-from admin_interface.compat import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AdminInterfaceConfig(AppConfig):

admin_interface/compat.py

@@ -2,10 +2,9 @@
 
 from __future__ import unicode_literals
 
+from django.core.validators import FileExtensionValidator
 from django.db import migrations, models
 
-from admin_interface.compat import FileExtensionValidator
-
 
 class Migration(migrations.Migration):
 

admin_interface/migrations/0021_file_extension_validator.py

@@ -1,14 +1,13 @@
 from colorfield.fields import ColorField
+from django.core.validators import FileExtensionValidator
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-from six import python_2_unicode_compatible
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 
-from admin_interface.cache import del_cached_active_theme
-from admin_interface.compat import FileExtensionValidator, force_str
-from admin_interface.compat import gettext_lazy as _
+from .cache import del_cached_active_theme
 
 
-@python_2_unicode_compatible
 class Theme(models.Model):
     @staticmethod
     def post_migrate_handler(**kwargs):

admin_interface/models.py

@@ -42,11 +42,7 @@
             if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
                 openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
-            else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
-                // django 1.7 compatibility
-                openerRef.dismissAddAnotherPopup(windowRef, initData.value, initData.obj);
-            }
             break;
     }
 
-})();
+})();

admin_interface/static/admin/js/popup_response.js

@@ -70,7 +70,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                     }
                 }
 
-                // fix for django 1.7
+                // fix for django 1.7  TODO remove
                 if (iframeSrc.indexOf('_popup=1') === -1) {
                     if (iframeSrc.indexOf('?') === -1) {
                         iframeSrc += '?_popup=1';
@@ -135,10 +135,6 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
             window.presentRelatedObjectModal = presentRelatedObjectModal;
             window.presentRelatedObjectModalOnClickOn = presentRelatedObjectModalOnClickOn;
 
-            // django 1.7 compatibility
-            presentRelatedObjectModalOnClickOn('a.add-another');
-
-            // django 1.8 and above
             presentRelatedObjectModalOnClickOn('a.related-widget-wrapper-link');
 
             // raw_id_fields support

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -4,10 +4,10 @@
 from django import template
 from django.conf import settings
 from django.template.loader import get_template
+from django.urls import NoReverseMatch, reverse
 from django.utils import translation
 
 from admin_interface.cache import get_cached_active_theme, set_cached_active_theme
-from admin_interface.compat import NoReverseMatch, reverse
 from admin_interface.models import Theme
 from admin_interface.version import __version__