Ticket #16110: 16110-2.diff

django/contrib/gis/forms/fields.py

@@ -1 +1 @@
 from __future__ import unicode_literals
 
+import warnings
+
 from django import forms
+from django.core import validators
 from django.utils.translation import ugettext_lazy as _
 
 # While this couples the geographic forms to the GEOS library,
@@ -16 +19 @@
     widget = forms.Textarea
 
     default_error_messages = {
-        'no_geom' : _('No geometry value provided.'),
+        'required' : _('No geometry value provided.'),
         'invalid_geom' : _('Invalid geometry value.'),
         'invalid_geom_type' : _('Invalid geometry type.'),
         'transform_error' : _('An error occurred when transforming the geometry '
@@ -28 +31 @@
         # defaults (e.g., allow None).
         self.srid = kwargs.pop('srid', None)
         self.geom_type = kwargs.pop('geom_type', 'GEOMETRY')
-        self.null = kwargs.pop('null', True)
+        if 'null' in kwargs:
+            _ = kwargs.pop('null', True)
+            warnings.warn("Passing 'null' keyword argument to GeometryField is deprecated.",
+                DeprecationWarning, stacklevel=2)
         super(GeometryField, self).__init__(**kwargs)
 
     def to_python(self, value):
@@ -46 +52 @@
         object (which is returned).  A ValidationError is raised if
         the value cannot be instantiated as a Geometry.
         """
-        if not value:
-            if self.null and not self.required:
-                # The geometry column allows NULL and is not required.
-                return None
-            else:
-                raise forms.ValidationError(self.error_messages['no_geom'])
+        self.validate(value)
+        if value in validators.EMPTY_VALUES:
+            return value
 
-        # Transform the value to a python object first
         geom = self.to_python(value)
 
         # Ensuring that the geometry is of the correct type (indicated

django/contrib/gis/tests/test_geoforms.py

@@ -1 +1 @@
 from django.forms import ValidationError
 from django.contrib.gis.gdal import HAS_GDAL
 from django.contrib.gis.tests.utils import HAS_SPATIALREFSYS
+from django.utils import six
 from django.utils import unittest
 
 
@@ -37 +38 @@
         "Testing GeometryField's handling of null (None) geometries."
         # Form fields, by default, are required (`required=True`)
         fld = forms.GeometryField()
-        self.assertRaises(forms.ValidationError, fld.clean, None)
-
-        # Still not allowed if `null=False`.
-        fld = forms.GeometryField(required=False, null=False)
-        self.assertRaises(forms.ValidationError, fld.clean, None)
+        with six.assertRaisesRegex(self, forms.ValidationError,
+                "No geometry value provided."):
+            fld.clean(None)
 
         # This will clean None as a geometry (See #10660).
         fld = forms.GeometryField(required=False)
-        self.assertEqual(None, fld.clean(None))
+        self.assertIsNone(fld.clean(None))
 
     def test03_geom_type(self):
         "Testing GeometryField's handling of different geometry types."