Merge f3b2673 into 99cbf3c

leaflet/__init__.py

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

leaflet/templatetags/leaflet_tags.py

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