fix: Django 1.11 compatibility

Author: Gagaro

.travis.yml

@@ -75,6 +75,10 @@ matrix:
       env: DJANGO_VERSION=dev DATABASE=sqlite
     - python: 3.5
       env: DJANGO_VERSION=dev DATABASE=postgres
+    - python: 3.6
+      env: DJANGO_VERSION=dev DATABASE=sqlite
+    - python: 3.6
+      env: DJANGO_VERSION=dev DATABASE=postgres
 
 before_install:
   - sudo apt-get update

leaflet/forms/widgets.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+from distutils.version import LooseVersion
 
+from django import get_version
 from django import forms
 from django.core import validators
 from django.template.defaultfilters import slugify
@@ -36,11 +38,9 @@ def media(self):
     def serialize(self, value):
         return value.geojson if value else ''
 
-    def render(self, name, value, attrs=None):
+    def _get_attrs(self, name, attrs=None):
         assert self.map_srid == 4326, 'Leaflet vectors should be decimal degrees.'
 
-        value = None if value in validators.EMPTY_VALUES else value
-
         # Retrieve params from Field init (if any)
         self.geom_type = self.attrs.get('geom_type', self.geom_type)
         self.settings_overrides = self.attrs.get('settings_overrides', self.settings_overrides)
@@ -68,4 +68,17 @@ def render(self, name, value, attrs=None):
                      settings_overrides=attrs.get('settings_overrides', getattr(self, 'settings_overrides', None)),
                      geometry_field_class=attrs.get('geometry_field_class', getattr(self, 'geometry_field_class', 'L.GeometryField')),
                      field_store_class=attrs.get('field_store_class', getattr(self, 'field_store_class', 'L.FieldStore')))
-        return super(LeafletWidget, self).render(name, value, attrs)
+        return attrs
+
+    # Django 1.11 changed how the widgets are rendered
+    if LooseVersion(get_version()) >= LooseVersion('1.11'):
+        def get_context(self, name, value, attrs):
+            value = None if value in validators.EMPTY_VALUES else value
+            context = super(LeafletWidget, self).get_context(name, value, attrs)
+            context.update(self._get_attrs(name, attrs))
+            return context
+    else:
+        def render(self, name, value, attrs=None):
+            attrs = self._get_attrs(name, attrs)
+            value = None if value in validators.EMPTY_VALUES else value
+            return super(LeafletWidget, self).render(name, value, attrs)