Briq/django-admin-interface
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop old Python and Django versions (#220)

Browse Source 
* drop old python and django versions

* fix tests

* remove compat module entirely

Co-authored-by: Fabio Caccamo <fabio.caccamo@gmail.com>
This commit is contained in:
Éric
2022-12-03 07:49:09 -05:00
committed by GitHub
parent 333025f877
commit d62593e01b
24 changed files with 34 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin_interface/admin.py
+1 -3
View File
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
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 -4
View File
@@ -1,9 +1,6 @@
# -*- coding: utf-8 -*-
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/cache.py
-2
View File
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
from django.conf import settings
from django.core.cache import cache, caches
admin_interface/compat.py
-26
View File
@@ -1,26 +0,0 @@
# -*- coding: utf-8 -*-
import django
if django.VERSION >= (1, 11):
from django.core.validators import FileExtensionValidator
else:
def FileExtensionValidator(*args, **kwargs):
def noop(*args, **kwargs):
pass
return noop
if django.VERSION < (1, 10):
from django.core.urlresolvers import NoReverseMatch, reverse
else:
from django.urls import NoReverseMatch, reverse
if django.VERSION < (2, 0):
from django.utils.encoding import force_text as force_str
from django.utils.translation import ugettext_lazy as gettext_lazy
else:
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy
admin_interface/migrations/0021_file_extension_validator.py
+1 -2
View File
@@ -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/models.py
+4 -9
View File
@@ -1,18 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
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/settings.py
-4
View File
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
import django
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
@@ -29,5 +27,3 @@ def check_installed_app(app, max_dj_version=None):
def check_installed_apps():
check_installed_app("colorfield")
check_installed_app("flat", max_dj_version=(1, 9))
check_installed_app("flat_responsive", max_dj_version=(2, 0))
admin_interface/static/admin/js/popup_response.js
+1 -5
View File
@@ -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_interface/related-modal/related-modal.js
+1 -5
View File
@@ -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/templatetags/admin_interface_tags.py
+10 -18
View File
@@ -1,28 +1,20 @@
# -*- coding: utf-8 -*-
import hashlib
import re
import django
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__
register = template.Library()
if django.VERSION < (1, 9):
simple_tag = register.assignment_tag
else:
simple_tag = register.simple_tag
@simple_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def get_admin_interface_languages(context):
if not settings.USE_I18N:
# i18n disabled
@@ -65,7 +57,7 @@ def get_admin_interface_languages(context):
return langs_data
@simple_tag()
@register.simple_tag()
def get_admin_interface_theme():
theme = get_cached_active_theme()
if not theme:
@@ -74,20 +66,20 @@ def get_admin_interface_theme():
return theme
@simple_tag()
@register.simple_tag()
def get_admin_interface_setting(setting):
theme = get_admin_interface_theme()
return getattr(theme, setting)
@simple_tag()
@register.simple_tag()
def get_admin_interface_inline_template(template):
template_path = template.split("/")
template_path[-1] = "headerless_" + template_path[-1]
return "/".join(template_path)
@simple_tag(takes_context=False)
@register.simple_tag()
def get_admin_interface_version():
return __version__
@@ -98,17 +90,17 @@ def hash_string(text):
return sha224_hash
@simple_tag(takes_context=False)
@register.simple_tag()
def get_admin_interface_nocache():
return hash_string(__version__)
@simple_tag()
@register.simple_tag()
def admin_interface_clear_filter_qs(changelist, list_filter):
return changelist.get_query_string(remove=list_filter.expected_parameters())
@simple_tag()
@register.simple_tag()
def admin_interface_filter_removal_link(changelist, list_filter):
template = get_template("admin_interface/list_filter_removal_link.html")
title = list_filter.title
@@ -130,7 +122,7 @@ def admin_interface_filter_removal_link(changelist, list_filter):
)
@simple_tag()
@register.simple_tag()
def admin_interface_use_changeform_tabs(adminform, inline_forms):
theme = get_admin_interface_theme()
has_fieldset_tabs = theme.show_fieldsets_as_tabs and len(adminform.fieldsets) > 1
admin_interface/version.py
-2
View File
@@ -1,3 +1 @@
# -*- coding: utf-8 -*-
__version__ = "0.23.0"