[1.6.x] Fixed gis test to run on non gis-enabled settings

Refs #20998.
Backport of 973502c0 from master.

1 files changed, 12 insertions, 11 deletions

diff --git a/django/contrib/gis/tests/test_geoforms.py b/django/contrib/gis/tests/test_geoforms.py
index 47d66d6919..b4f608752a 100644
--- a/django/contrib/gis/tests/test_geoforms.py
+++ b/django/contrib/gis/tests/test_geoforms.py
@@ -245,25 +245,26 @@ class SpecializedFieldTest(SimpleTestCase):
 @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,
     "CustomGeometryWidgetTest needs gdal support and a spatial database")
 class CustomGeometryWidgetTest(SimpleTestCase):
-    class CustomGeometryWidget(forms.BaseGeometryWidget):
-        template_name = 'gis/openlayers.html'
-        deserialize_called = 0
-        def serialize(self, value):
-            return value.json if value else ''
-
-        def deserialize(self, value):
-            self.deserialize_called += 1
-            return GEOSGeometry(value)
 
     def test_custom_serialization_widget(self):
+        class CustomGeometryWidget(forms.BaseGeometryWidget):
+            template_name = 'gis/openlayers.html'
+            deserialize_called = 0
+            def serialize(self, value):
+                return value.json if value else ''
+
+            def deserialize(self, value):
+                self.deserialize_called += 1
+                return GEOSGeometry(value)
+
         class PointForm(forms.Form):
-            p = forms.PointField(widget=self.CustomGeometryWidget)
+            p = forms.PointField(widget=CustomGeometryWidget)
 
         point = GEOSGeometry("SRID=4326;POINT(9.052734375 42.451171875)")
         form = PointForm(data={'p': point})
         self.assertIn(escape(point.json), form.as_p())
 
-        self.CustomGeometryWidget.called = 0
+        CustomGeometryWidget.called = 0
         widget = form.fields['p'].widget
         # Force deserialize use due to a string value
         self.assertIn(escape(point.json), widget.render('p', point.json))