fixes for Django 1.10 compatibility

leaflet/__init__.py

@@ -21,6 +21,7 @@
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.utils.translation import ugettext_lazy as _
 from django.utils import six
+import django
 
 
 DEFAULT_TILES = [(_('OSM'), '//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
@@ -201,7 +202,14 @@ def _normalize_plugins_config():
 
     PLUGINS['__is_normalized__'] = True
 
-_normalize_plugins_config()
+
+default_app_config = 'leaflet.apps.LeafletConfig'
+
+if django.VERSION >= (1, 8, 0):  # otherwise is called in apps.py
+    if django.apps.apps.ready:
+        _normalize_plugins_config()
+else:
+    _normalize_plugins_config()
 
 
 class JSONLazyTranslationEncoder(DjangoJSONEncoder):

leaflet/apps.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from django.apps import AppConfig
+
+
+class LeafletConfig(AppConfig):
+    name = 'leaflet'
+    verbose_name = "Leaflet"
+
+    def ready(self):
+        from . import _normalize_plugins_config
+        _normalize_plugins_config()

leaflet/tests/tests.py

@@ -110,6 +110,9 @@ def test_default_widget(self):
 class DummyModel(gismodels.Model):
     geom = gismodels.PointField()
 
+    class Meta:
+        app_label = "leaflet"
+
 
 class DummyAdmin(LeafletGeoAdmin):
     settings_overrides = {

quicktest.py

@@ -27,6 +27,12 @@ class QuickDjangoTest(object):
         'django.contrib.sessions',
         'django.contrib.admin',
     ]
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
+        },
+    ]
 
     def __init__(self, *args, **kwargs):
         self.apps = kwargs.get('apps', [])
@@ -58,6 +64,7 @@ def run_tests(self):
         settings.configure(
             DATABASES=databases,
             INSTALLED_APPS=self.INSTALLED_APPS + self.apps,
+            TEMPLATES = self.TEMPLATES,
             STATIC_URL='/static/'
         )
         if django.VERSION >= (1, 7, 0):