p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed GIS testsuite. 

Moved HAS_SPATIALREFSYS back into the tests namespace since it only operates
on the default database and isn't a global flag like HAS_GDAL.
This commit is contained in:
Florian Apolloner 2012-06-17 11:39:02 +02:00
parent d708298184
commit ac1b9ae630
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/gis/gdal/__init__.py
View File

@ -44,18 +44,6 @@ try:
except: except:
HAS_GDAL, GEOJSON = False, False HAS_GDAL, GEOJSON = False, False
from django.contrib.gis.tests.utils import no_mysql, oracle, postgis, spatialite
HAS_SPATIALREFSYS = True
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
else:
HAS_SPATIALREFSYS = False
SpatialRefSys = None
try: try:
from django.contrib.gis.gdal.envelope import Envelope from django.contrib.gis.gdal.envelope import Envelope
except ImportError: except ImportError:

3
django/contrib/gis/tests/test_geoforms.py
View File

@ -1,5 +1,6 @@
from django.forms import ValidationError from django.forms import ValidationError
from django.contrib.gis.gdal import HAS_GDAL, HAS_SPATIALREFSYS from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.tests.utils import HAS_SPATIALREFSYS
from django.utils import unittest from django.utils import unittest

5
django/contrib/gis/tests/test_spatialrefsys.py
View File

@ -1,6 +1,7 @@
from django.db import connection from django.db import connection
from django.contrib.gis.gdal import HAS_GDAL, HAS_SPATIALREFSYS, SpatialRefSys from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.tests.utils import no_mysql, oracle, postgis, spatialite from django.contrib.gis.tests.utils import (no_mysql, oracle, postgis,
spatialite, HAS_SPATIALREFSYS, SpatialRefSys)
from django.utils import unittest from django.utils import unittest

11
django/contrib/gis/tests/utils.py
View File

@ -24,3 +24,14 @@ oracle = _default_db == 'oracle'
postgis = _default_db == 'postgis' postgis = _default_db == 'postgis'
mysql = _default_db == 'mysql' mysql = _default_db == 'mysql'
spatialite = _default_db == 'spatialite' spatialite = _default_db == 'spatialite'
HAS_SPATIALREFSYS = True
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
else:
HAS_SPATIALREFSYS = False
SpatialRefSys = None