Ticket #9806: 9806.diff

django/contrib/gis/admin/widgets.py

@@ -23 +23 @@
                 value = GEOSGeometry(value)
             except (GEOSException, ValueError):
                 value = None
-
-        if value and value.geom_type.upper() != self.geom_type:
+        if value and value.geom_type.upper() != self.geom_type and self.geom_type != 'GEOMETRY':
             value = None
 
         # Constructing the dictionary of the map options.

django/contrib/gis/gdal/geomtype.py

@@ -24 +24 @@
         if isinstance(type_input, OGRGeomType):
             num = type_input.num
         elif isinstance(type_input, basestring):
+            if type_input.lower() == 'geometry': type_input='unknown'
             num = self._str_types.get(type_input.lower(), None)
             if num is None:
                 raise OGRException('Invalid OGR String Type "%s"' % type_input)