Various compatibility fixes

matthiask · matthiask · commit 17de1d0371bd · 2019-02-01T18:42:45.000+01:00
diff --git a/feincms/admin/tree_editor.py b/feincms/admin/tree_editor.py
@@ -11,7 +11,6 @@
 from django.contrib.admin.views import main
 from django.contrib.admin.actions import delete_selected
 from django.contrib.auth import get_permission_codename
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.db.models import Q
 from django.http import (
     HttpResponse,
@@ -31,6 +30,12 @@
 from feincms import settings
 from feincms.extensions import ExtensionModelAdmin
 
+try:
+    # Django<3
+    from django.contrib.staticfiles.templatetags.staticfiles import static
+except ImportError:
+    from django.templatetags.static import static
+
 
 logger = logging.getLogger(__name__)
 
diff --git a/feincms/contrib/fields.py b/feincms/contrib/fields.py
@@ -69,7 +69,7 @@ def to_python(self, value):
             assert value is None
             return {}
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection, context=None):
         return self.to_python(value)
 
     def get_prep_value(self, value):
diff --git a/feincms/module/medialibrary/models.py b/feincms/module/medialibrary/models.py
@@ -143,7 +143,7 @@ def register_filetypes(cls, *types):
         cls.filetypes[0:0] = types
         choices = [t[0:2] for t in cls.filetypes]
         cls.filetypes_dict = dict(choices)
-        cls._meta.get_field("type").choices[:] = choices
+        cls._meta.get_field("type").choices = choices
 
     def __init__(self, *args, **kwargs):
         super(MediaFileBase, self).__init__(*args, **kwargs)
diff --git a/feincms/templates/admin/feincms/_regions_js.html b/feincms/templates/admin/feincms/_regions_js.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <script type="text/javascript" charset="utf-8">
 IMG_DELETELINK_PATH = "{% static 'feincms/img/icon_deletelink.gif' %}";
 
diff --git a/feincms/templates/admin/feincms/item_editor.html b/feincms/templates/admin/feincms/item_editor.html
@@ -1,5 +1,5 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify admin_urls staticfiles %}
+{% load i18n admin_modify admin_urls static %}
 
 {% block extrahead %}{{ block.super }}
 {% block feincms_jquery_ui %}
diff --git a/feincms/templates/admin/feincms/load-jquery.include b/feincms/templates/admin/feincms/load-jquery.include
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% comment %}
 Include jquery, override this template if you want to use a cdn version
 or load more plugins or whatnot
diff --git a/feincms/templates/admin/feincms/tree_editor.html b/feincms/templates/admin/feincms/tree_editor.html
@@ -1,5 +1,5 @@
 {% extends "admin/change_list.html" %}
-{% load admin_list i18n staticfiles %}
+{% load admin_list i18n static %}
 
 {% block extrahead %}
 {{ block.super }}
diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py
@@ -78,7 +78,7 @@
     # Anything to make mptt.templatetags.mptt_admin importable
     deprecation.RemovedInDjango20Warning = deprecation.RemovedInDjango21Warning
 
-elif django.VERSION >= (2,):
+elif django.VERSION < (3,):
     from django.utils import deprecation
 
     # Anything to make mptt.templatetags.mptt_admin importable

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load staticfiles %}`
	`1`	`+{% load static %}`
`2`	`2`	`<script type="text/javascript" charset="utf-8">`
`3`	`3`	`IMG_DELETELINK_PATH = "{% static 'feincms/img/icon_deletelink.gif' %}";`
`4`	`4`