Made gis_terms be a set, rather than a dict with None for all keys.

django/contrib/gis/db/backends/base.py

@@ -3,10 +3,12 @@ Base/mixin classes for the spatial backend database operations and the
 `SpatialRefSys` model the backend.
 """
 import re
+
 from django.contrib.gis import gdal
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 
+
 class BaseSpatialOperations(object):
     """
     This module holds the base `BaseSpatialBackend` object, which is
@@ -18,7 +20,7 @@ class BaseSpatialOperations(object):
     geometry_operators = {}
     geography_operators = {}
     geography_functions = {}
-    gis_terms = {}
+    gis_terms = set()
     truncate_params = {}
 
     # Quick booleans for the type of this spatial backend, and

django/contrib/gis/db/backends/mysql/operations.py

@@ -3,7 +3,6 @@ from django.db.backends.mysql.base import DatabaseOperations
 from django.contrib.gis.db.backends.adapter import WKTAdapter
 from django.contrib.gis.db.backends.base import BaseSpatialOperations
 
-from django.utils import six
 
 class MySQLOperations(DatabaseOperations, BaseSpatialOperations):
 
@@ -32,7 +31,7 @@ class MySQLOperations(DatabaseOperations, BaseSpatialOperations):
         'within': 'MBRWithin',
     }
 
-    gis_terms = dict([(term, None) for term in list(geometry_functions) + ['isnull']])
+    gis_terms = set(geometry_functions) | set(['isnull'])
 
     def geo_db_type(self, f):
         return f.geom_type

django/contrib/gis/db/backends/oracle/operations.py

@@ -18,6 +18,7 @@ from django.contrib.gis.geometry.backend import Geometry
 from django.contrib.gis.measure import Distance
 from django.utils import six
 
+
 class SDOOperation(SpatialFunction):
     "Base class for SDO* Oracle operations."
     sql_template = "%(function)s(%(geo_col)s, %(geometry)s) %(operator)s '%(result)s'"
@@ -32,6 +33,7 @@ class SDODistance(SpatialFunction):
     sql_template = ('%(function)s(%(geo_col)s, %(geometry)s, %(tolerance)s) '
                     '%(operator)s %(result)s')
     dist_func = 'SDO_GEOM.SDO_DISTANCE'
+
     def __init__(self, op, tolerance=0.05):
         super(SDODistance, self).__init__(self.dist_func,
                                           tolerance=tolerance,
@@ -40,6 +42,7 @@ class SDODistance(SpatialFunction):
 class SDODWithin(SpatialFunction):
     dwithin_func = 'SDO_WITHIN_DISTANCE'
     sql_template = "%(function)s(%(geo_col)s, %(geometry)s, %%s) = 'TRUE'"
+
     def __init__(self):
         super(SDODWithin, self).__init__(self.dwithin_func)
 
@@ -48,6 +51,7 @@ class SDOGeomRelate(SpatialFunction):
     relate_func = 'SDO_GEOM.RELATE'
     sql_template = ("%(function)s(%(geo_col)s, '%(mask)s', %(geometry)s, "
                     "%(tolerance)s) %(operator)s '%(mask)s'")
+
     def __init__(self, mask, tolerance=0.05):
         # SDO_GEOM.RELATE(...) has a peculiar argument order: column, mask, geom, tolerance.
         # Moreover, the runction result is the mask (e.g., 'DISJOINT' instead of 'TRUE').
@@ -60,6 +64,7 @@ class SDORelate(SpatialFunction):
     mask_regex = re.compile(r'^(%s)(\+(%s))*$' % (masks, masks), re.I)
     sql_template = "%(function)s(%(geo_col)s, %(geometry)s, 'mask=%(mask)s') = 'TRUE'"
     relate_func = 'SDO_RELATE'
+
     def __init__(self, mask):
         if not self.mask_regex.match(mask):
             raise ValueError('Invalid %s mask: "%s"' % (self.relate_func, mask))
@@ -127,9 +132,8 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
         }
     geometry_functions.update(distance_functions)
 
-    gis_terms = ['isnull']
+    gis_terms = set(['isnull'])
-    gis_terms += list(geometry_functions)
+    gis_terms.update(geometry_functions)
-    gis_terms = dict([(term, None) for term in gis_terms])
 
     truncate_params = {'relate' : None}
 
@@ -272,7 +276,8 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
         given Aggregate instance.
         """
         agg_name = agg.__class__.__name__.lower()
-        if agg_name == 'union' : agg_name += 'agg'
+        if agg_name == 'union':
+            agg_name += 'agg'
         if agg.is_extent:
             sql_template = '%(function)s(%(field)s)'
         else:

django/contrib/gis/db/backends/postgis/operations.py

@@ -221,10 +221,9 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
             self.geometry = True
 
         # Creating a dictionary lookup of all GIS terms for PostGIS.
-        gis_terms = ['isnull']
+        self.gis_terms = set(['isnull'])
-        gis_terms += list(self.geometry_operators)
+        self.gis_terms.update(self.geometry_operators)
-        gis_terms += list(self.geometry_functions)
+        self.gis_terms.update(self.geometry_functions)
-        self.gis_terms = dict([(term, None) for term in gis_terms])
 
         self.area = prefix + 'Area'
         self.bounding_circle = BOUNDINGCIRCLE
@@ -565,7 +564,8 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
         if not self.check_aggregate_support(agg):
             raise NotImplementedError('%s spatial aggregate is not implmented for this backend.' % agg_name)
         agg_name = agg_name.lower()
-        if agg_name == 'union': agg_name += 'agg'
+        if agg_name == 'union':
+            agg_name += 'agg'
         sql_template = '%(function)s(%(field)s)'
         sql_function = getattr(self, agg_name)
         return sql_template, sql_function

django/contrib/gis/db/backends/spatialite/operations.py

@@ -117,9 +117,8 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
         super(DatabaseOperations, self).__init__(connection)
 
         # Creating the GIS terms dictionary.
-        gis_terms = ['isnull']
+        self.gis_terms = set(['isnull'])
-        gis_terms += self.geometry_functions.keys()
+        self.gis_terms.update(self.geometry_functions)
-        self.gis_terms = dict([(term, None) for term in gis_terms])
 
     @cached_property
     def spatial_version(self):