summaryrefslogtreecommitdiff
path: root/django/contrib/gis/tests/utils.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-06-08 09:54:35 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-06-08 21:15:47 +0200
commit6e5651e514367174a3fa887d6babfe3830339b16 (patch)
tree7c6a76f8ee4a3b34c3032ff064e67cd6e0afb9fc /django/contrib/gis/tests/utils.py
parentd8f6b55aa8f05a479eb0018b470932805f2c95d1 (diff)
downloaddjango-6e5651e514367174a3fa887d6babfe3830339b16.tar.gz
Gave unique names to SpatialRefSysModels.
Prevented clashes in the app registry. Fixed #22790. Thanks timo for the report.
Diffstat (limited to 'django/contrib/gis/tests/utils.py')
-rw-r--r--django/contrib/gis/tests/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/tests/utils.py b/django/contrib/gis/tests/utils.py
index a53b9a3564..aad978039f 100644
--- a/django/contrib/gis/tests/utils.py
+++ b/django/contrib/gis/tests/utils.py
@@ -41,11 +41,11 @@ spatialite = _default_db == 'spatialite'
HAS_SPATIALREFSYS = True
if oracle and 'gis' in settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE']:
- from django.contrib.gis.db.backends.oracle.models import SpatialRefSys
+ from django.contrib.gis.db.backends.oracle.models import OracleSpatialRefSys as SpatialRefSys
elif postgis:
- from django.contrib.gis.db.backends.postgis.models import SpatialRefSys
+ from django.contrib.gis.db.backends.postgis.models import PostGISSpatialRefSys as SpatialRefSys
elif spatialite:
- from django.contrib.gis.db.backends.spatialite.models import SpatialRefSys
+ from django.contrib.gis.db.backends.spatialite.models import SpatialiteSpatialRefSys as SpatialRefSys
else:
HAS_SPATIALREFSYS = False
SpatialRefSys = None