diff -r b758351d191f -r cc9b7e14412b web/lib/django/contrib/gis/tests/test_spatialrefsys.py --- a/web/lib/django/contrib/gis/tests/test_spatialrefsys.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/contrib/gis/tests/test_spatialrefsys.py Tue May 25 02:43:45 2010 +0200 @@ -1,8 +1,7 @@ import unittest -from django.contrib.gis.db.backend import SpatialBackend + +from django.db import connection from django.contrib.gis.tests.utils import mysql, no_mysql, oracle, postgis, spatialite -if not mysql: - from django.contrib.gis.models import SpatialRefSys test_srs = ({'srid' : 4326, 'auth_name' : ('EPSG', True), @@ -28,9 +27,12 @@ }, ) -if SpatialBackend.postgis: - major, minor1, minor2 = SpatialBackend.version - POSTGIS_14 = major >=1 and minor1 >= 4 +if oracle: + from django.contrib.gis.db.backends.oracle.models import SpatialRefSys +elif postgis: + from django.contrib.gis.db.backends.postgis.models import SpatialRefSys +elif spatialite: + from django.contrib.gis.db.backends.spatialite.models import SpatialRefSys class SpatialRefSysTest(unittest.TestCase): @@ -52,7 +54,7 @@ # No proj.4 and different srtext on oracle backends :( if postgis: - if POSTGIS_14: + if connection.ops.spatial_version >= (1, 4, 0): srtext = sd['srtext14'] else: srtext = sd['srtext'] @@ -79,7 +81,7 @@ self.assertEqual(sd['proj4'], srs.proj4) # No `srtext` field in the `spatial_ref_sys` table in SpatiaLite if not spatialite: - if POSTGIS_14: + if connection.ops.spatial_version >= (1, 4, 0): srtext = sd['srtext14'] else: srtext = sd['srtext']