From 49f1cc54e6ce1147645372214c5b5a56c655da9e Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Mon, 30 Nov 2015 12:57:44 +0500 Subject: [PATCH] Fixed #25835 -- Removed Adaptor alias from spatial operations classes. --- django/contrib/gis/db/backends/mysql/operations.py | 1 - django/contrib/gis/db/backends/oracle/operations.py | 1 - django/contrib/gis/db/backends/postgis/operations.py | 1 - django/contrib/gis/db/backends/spatialite/operations.py | 1 - 4 files changed, 4 deletions(-) diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index de64bc95db..c31504c40e 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -16,7 +16,6 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): from_text = 'GeomFromText' Adapter = WKTAdapter - Adaptor = Adapter # Backwards-compatibility alias. gis_operators = { 'bbcontains': SpatialOperator(func='MBRContains'), # For consistency w/PostGIS API diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index 722ef9f29b..2404cf9bc4 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -60,7 +60,6 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations): disallowed_aggregates = (aggregates.Collect, aggregates.Extent3D, aggregates.MakeLine) Adapter = OracleSpatialAdapter - Adaptor = Adapter # Backwards-compatibility alias. area = 'SDO_GEOM.SDO_AREA' gml = 'SDO_UTIL.TO_GMLGEOMETRY' diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index ed9d5b10fb..8c630f5ca0 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -56,7 +56,6 @@ class PostGISOperations(BaseSpatialOperations, DatabaseOperations): version_regex = re.compile(r'^(?P\d)\.(?P\d)\.(?P\d+)') Adapter = PostGISAdapter - Adaptor = Adapter # Backwards-compatibility alias. gis_operators = { 'bbcontains': PostGISOperator(op='~'), diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py index f5884a4c7b..f4aef508b5 100644 --- a/django/contrib/gis/db/backends/spatialite/operations.py +++ b/django/contrib/gis/db/backends/spatialite/operations.py @@ -25,7 +25,6 @@ class SpatiaLiteOperations(BaseSpatialOperations, DatabaseOperations): version_regex = re.compile(r'^(?P\d)\.(?P\d)\.(?P\d+)') Adapter = SpatiaLiteAdapter - Adaptor = Adapter # Backwards-compatibility alias. area = 'Area' centroid = 'Centroid'