Moved contrib.gis.geometry.regex to contrib.gis.geometry.

django/contrib/gis/gdal/geometries.py

@@ -49,7 +49,7 @@ from django.contrib.gis.gdal.geomtype import OGRGeomType
 from django.contrib.gis.gdal.libgdal import GDAL_VERSION
 from django.contrib.gis.gdal.prototypes import geom as capi, srs as srs_api
 from django.contrib.gis.gdal.srs import CoordTransform, SpatialReference
-from django.contrib.gis.geometry.regex import hex_regex, json_regex, wkt_regex
+from django.contrib.gis.geometry import hex_regex, json_regex, wkt_regex
 from django.utils.encoding import force_bytes
 
 

django/contrib/gis/gdal/raster/source.py

@@ -16,7 +16,7 @@ from django.contrib.gis.gdal.raster.const import (
     VSI_FILESYSTEM_BASE_PATH, VSI_TAKE_BUFFER_OWNERSHIP,
 )
 from django.contrib.gis.gdal.srs import SpatialReference, SRSException
-from django.contrib.gis.geometry.regex import json_regex
+from django.contrib.gis.geometry import json_regex
 from django.utils.encoding import force_bytes, force_text
 from django.utils.functional import cached_property
 

django/contrib/gis/geos/geometry.py

@@ -6,7 +6,7 @@ import re
 from ctypes import addressof, byref, c_double
 
 from django.contrib.gis import gdal
-from django.contrib.gis.geometry.regex import hex_regex, json_regex, wkt_regex
+from django.contrib.gis.geometry import hex_regex, json_regex, wkt_regex
 from django.contrib.gis.geos import prototypes as capi
 from django.contrib.gis.geos.base import GEOSBase
 from django.contrib.gis.geos.coordseq import GEOSCoordSeq