summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2014-11-19 14:29:05 -0700
committerCarl Meyer <carl@oddbird.net>2014-11-19 14:29:05 -0700
commit4932a7b8e0a25c7447d7ad7ae8ae53a35d2541ac (patch)
tree547a5c34d2cb1fee9d0ca73afe2a6eb5a3353a28
parent5bcd292098b4de7bb03ef778e24d9e2f433d0dae (diff)
Fixed GIS tests to again skip without error when GEOS is not installed.
-rw-r--r--django/contrib/gis/tests/geoapp/test_serializers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/gis/tests/geoapp/test_serializers.py b/django/contrib/gis/tests/geoapp/test_serializers.py
index 18809264f8..5656ea6f4e 100644
--- a/django/contrib/gis/tests/geoapp/test_serializers.py
+++ b/django/contrib/gis/tests/geoapp/test_serializers.py
@@ -6,10 +6,9 @@ from django.contrib.gis.geos import HAS_GEOS
from django.core import serializers
from django.test import TestCase, skipUnlessDBFeature
-from .models import City, MultiFields, PennsylvaniaCity
-
if HAS_GEOS:
from django.contrib.gis.geos import LinearRing, Point, Polygon
+ from .models import City, MultiFields, PennsylvaniaCity
@skipUnlessDBFeature("gis_enabled")