mirror of https://github.com/django/django.git
Fixed gis_tests when run without GIS dependencies.
This commit is contained in:
parent
d974c89ebb
commit
ed336a1a5d
|
@ -1,6 +1,6 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from django.contrib.gis.geos import HAS_GEOS, Point
|
from django.contrib.gis.geos import HAS_GEOS
|
||||||
from django.contrib.gis.measure import D # alias for Distance
|
from django.contrib.gis.measure import D # alias for Distance
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
@ -9,7 +9,7 @@ from django.test import TestCase, skipUnlessDBFeature
|
||||||
from ..utils import no_oracle, oracle, postgis, spatialite
|
from ..utils import no_oracle, oracle, postgis, spatialite
|
||||||
|
|
||||||
if HAS_GEOS:
|
if HAS_GEOS:
|
||||||
from django.contrib.gis.geos import GEOSGeometry, LineString
|
from django.contrib.gis.geos import GEOSGeometry, LineString, Point
|
||||||
|
|
||||||
from .models import (AustraliaCity, Interstate, SouthTexasInterstate,
|
from .models import (AustraliaCity, Interstate, SouthTexasInterstate,
|
||||||
SouthTexasCity, SouthTexasCityFt, CensusZipcode, SouthTexasZipcode)
|
SouthTexasCity, SouthTexasCityFt, CensusZipcode, SouthTexasZipcode)
|
||||||
|
|
Loading…
Reference in New Issue