From 6e5651e514367174a3fa887d6babfe3830339b16 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 8 Jun 2014 09:54:35 +0200 Subject: Gave unique names to SpatialRefSysModels. Prevented clashes in the app registry. Fixed #22790. Thanks timo for the report. --- django/contrib/gis/tests/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'django/contrib/gis/tests/utils.py') 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 -- cgit v1.2.1