Merge 11ea3f7 into 99cbf3c

leaflet/__init__.py

@@ -18,9 +18,19 @@
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.contrib.staticfiles.templatetags.staticfiles import static
+
+try:
+    from django.templatetags.static import static
+except ImportError:
+    from django.contrib.staticfiles.templatetags.staticfiles import static
+
 from django.utils.translation import ugettext_lazy as _
-from django.utils import six
+
+try:
+    import six
+except ImportError:
+    from django.utils import six
+
 import django
 
 from .utils import memoized_lazy_function, ListWithLazyItems, ListWithLazyItemsRawIterator

leaflet/forms/backport.py

@@ -39,7 +39,12 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.forms.widgets import Widget
 from django.template import loader
-from django.utils import six
+
+try:
+    import six
+except ImportError:
+    from django.utils import six
+
 from django.utils import translation
 from django import forms
 from django.utils.translation import ugettext_lazy as _

leaflet/templatetags/leaflet_tags.py

@@ -5,7 +5,12 @@
 
 from django import template
 from django.conf import settings
-from django.utils import six
+
+try:
+    import six
+except ImportError:
+    from django.utils import six
+
 from django.utils.encoding import force_text
 
 from leaflet import (app_settings, SPATIAL_EXTENT, SRID, PLUGINS, PLUGINS_DEFAULT,

leaflet/tests/tests.py

@@ -4,14 +4,24 @@
 
 import django
 from django.contrib.staticfiles.storage import StaticFilesStorage, staticfiles_storage
-from django.contrib.staticfiles.templatetags.staticfiles import static
+
+try:
+    from django.templatetags.static import static
+except ImportError:
+    from django.contrib.staticfiles.templatetags.staticfiles import static
+
 from django.test import SimpleTestCase
 from django.contrib.admin import ModelAdmin, StackedInline
 from django.contrib.admin.options import BaseModelAdmin, InlineModelAdmin
 from django.contrib.gis.db import models as gismodels
 
 from .. import PLUGINS, PLUGIN_FORMS, _normalize_plugins_config, JSONLazyTranslationEncoder
-from django.utils import six
+
+try:
+    import six
+except ImportError:
+    from django.utils import six
+
 from django.utils.translation import ugettext_lazy
 from ..templatetags import leaflet_tags
 from ..admin import LeafletGeoAdmin, LeafletGeoAdminMixin