diff options
| author | Tim Graham <timograham@gmail.com> | 2017-09-11 21:18:55 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-09-12 09:51:02 -0400 |
| commit | 2a4b33134883b80870b4b23e59ccd3b6cb7266a3 (patch) | |
| tree | 749338607c324658c9900fd8b935c533307d1a1b | |
| parent | f896eb30f6cabdccaab4f9a7fc5c6cda515fc325 (diff) | |
Moved contrib.gis.geometry.regex to contrib.gis.geometry.
| -rw-r--r-- | django/contrib/gis/gdal/geometries.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/gdal/raster/source.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/geometry.py (renamed from django/contrib/gis/geometry/regex.py) | 0 | ||||
| -rw-r--r-- | django/contrib/gis/geometry/__init__.py | 0 | ||||
| -rw-r--r-- | django/contrib/gis/geos/geometry.py | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py index 7b304d9af0..35ce8d5157 100644 --- a/django/contrib/gis/gdal/geometries.py +++ b/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 diff --git a/django/contrib/gis/gdal/raster/source.py b/django/contrib/gis/gdal/raster/source.py index 358bb44b8f..bf84eeef1a 100644 --- a/django/contrib/gis/gdal/raster/source.py +++ b/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 diff --git a/django/contrib/gis/geometry/regex.py b/django/contrib/gis/geometry.py index 6727c7d942..6727c7d942 100644 --- a/django/contrib/gis/geometry/regex.py +++ b/django/contrib/gis/geometry.py diff --git a/django/contrib/gis/geometry/__init__.py b/django/contrib/gis/geometry/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/django/contrib/gis/geometry/__init__.py +++ /dev/null diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py index e486190cc2..bcda25fa2f 100644 --- a/django/contrib/gis/geos/geometry.py +++ b/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 |