Merge 46901ba into 87dc475

tastypie/resources.py

@@ -10,10 +10,14 @@
 import django
 from django.conf import settings
 from django.conf.urls import patterns, url
-from django.contrib.gis.db.models.fields import GeometryField
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, ValidationError
 from django.core.urlresolvers import NoReverseMatch, reverse, resolve, Resolver404, get_script_prefix
 from django.core.signals import got_request_exception
+from django.core.exceptions import ImproperlyConfigured
+try:
+    from django.contrib.gis.db.models.fields import GeometryField
+except ImproperlyConfigured:
+    GeometryField = None
 from django.db import transaction
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.sql.constants import QUERY_TERMS
@@ -1975,7 +1979,7 @@ def build_filters(self, filters=None):
             query_terms = self._meta.queryset.query.query_terms
         else:
             query_terms = QUERY_TERMS
-        if django.VERSION >= (1, 8):
+        if django.VERSION >= (1, 8) and GeometryField:
             query_terms = query_terms | set(GeometryField.class_lookups.keys())
 
         for filter_expr, value in filters.items():