[1.8.x] Refs #24485 -- Renamed some expression types

Backport of 88d798d71a from master

django/contrib/gis/db/models/fields.py

@@ -2,7 +2,7 @@ from django.contrib.gis import forms
 from django.contrib.gis.db.models.lookups import gis_lookups
 from django.contrib.gis.db.models.proxy import GeometryProxy
 from django.contrib.gis.geometry.backend import Geometry, GeometryException
-from django.db.models.expressions import ExpressionNode
+from django.db.models.expressions import Expression
 from django.db.models.fields import Field
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
@@ -188,7 +188,7 @@ class GeometryField(GeoSelectFormatMixin, Field):
         returning to the caller.
         """
         value = super(GeometryField, self).get_prep_value(value)
-        if isinstance(value, ExpressionNode):
+        if isinstance(value, Expression):
             return value
         elif isinstance(value, (tuple, list)):
             geom = value[0]
@@ -282,7 +282,7 @@ class GeometryField(GeoSelectFormatMixin, Field):
                     pass
                 else:
                     params += value[1:]
-            elif isinstance(value, ExpressionNode):
+            elif isinstance(value, Expression):
                 params = []
             else:
                 params = [connection.ops.Adapter(value)]

django/contrib/gis/db/models/lookups.py

@@ -4,7 +4,7 @@ import re
 
 from django.core.exceptions import FieldDoesNotExist
 from django.db.models.constants import LOOKUP_SEP
-from django.db.models.expressions import Col, ExpressionNode
+from django.db.models.expressions import Col, Expression
 from django.db.models.lookups import Lookup
 from django.utils import six
 
@@ -80,7 +80,7 @@ class GISLookup(Lookup):
             if not hasattr(geo_fld, 'srid'):
                 raise ValueError('No geographic field found in expression.')
             self.rhs.srid = geo_fld.srid
-        elif isinstance(self.rhs, ExpressionNode):
+        elif isinstance(self.rhs, Expression):
             raise ValueError('Complex expressions not supported for GeometryField')
         elif isinstance(self.rhs, (list, tuple)):
             geom = self.rhs[0]