Ticket #16110: geodjango_16110.diff

django/contrib/gis/forms/fields.py

@@ -26 +26 @@
         # 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)
+        self.null = kwargs.pop('null', True)  # Never checked: stop passing this?
         super(GeometryField, self).__init__(**kwargs)
 
     def clean(self, value):
@@ -36 +36 @@
         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:
+            if self.required:
                 raise forms.ValidationError(self.error_messages['no_geom'])
+            else:
+                return None
 
         # Trying to create a Geometry object from the form value.
         try:

django/contrib/gis/tests/test_geoforms.py

@@ -34 +34 @@
         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)
-
         # This will clean None as a geometry (See #10660).
         fld = forms.GeometryField(required=False)
         self.assertEqual(None, fld.clean(None))
 
+        # We used to check the underlying db_field's nullability
+        # and effectively override required=False. Don't do that anymore.
+        # See #16610.
+        fld = forms.GeometryField(required=False, null=False)
+        self.assertEqual(None, fld.clean(None))
+
+
     def test03_geom_type(self):
         "Testing GeometryField's handling of different geometry types."
         # By default, all geometry types are allowed.