Ticket #5438: proxy_newmodel_none.patch

django/contrib/gis/db/models/proxy.py

@@ -19 +19 @@
         # Getting the value of the field.
         geom_value = obj.__dict__[self._field.attname] 
 
-        if (geom_value is None) or (isinstance(geom_value, GEOSGeometry)): 
+        if isinstance(geom_value, GEOSGeometry): 
             # If the value of the field is None, or is already a GEOS Geometry
             #  no more work is needed.
-            geom = geom_value 
+            geom = geom_value
+        elif (geom_value is None) or (geom_value==''):
+            geom = None
         else: 
             # Otherwise, a GEOSGeometry object is built using the field's contents,
             #  and the model's corresponding attribute is set.

django/contrib/gis/tests/geoapp/tests.py

@@ -256 +256 @@
         self.assertEqual('Texas', Country.objects.get(mpoly__relate=(pnt2, 'T********')).name)
         self.assertEqual('Lawrence', City.objects.get(point__relate=(ks.poly, 'T********')).name)
 
+    def test16_createnull(self):
+        "Testing creating a model instance and the geometry being None"
+        c = City()
+        self.assertEqual(c.point, None)
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(GeoModelTest))