From 33d4aa8df121f1fa3019aa6663d02b547d38aa80 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Wed, 5 May 2010 16:06:39 +0000 Subject: [PATCH] Removed duplicated code from `django.contrib.gis.db.backend` and added a deprecation note about the module. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13103 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/db/backend/__init__.py | 13 ------------- docs/internals/deprecation.txt | 3 +++ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/django/contrib/gis/db/backend/__init__.py b/django/contrib/gis/db/backend/__init__.py index ecf41e05ac4..72ebdfee6bf 100644 --- a/django/contrib/gis/db/backend/__init__.py +++ b/django/contrib/gis/db/backend/__init__.py @@ -9,16 +9,3 @@ if hasattr(connection.ops, 'spatial_version'): 'backend. A `SpatialBackend` alias is provided here for ' 'backwards-compatibility, but will be removed in 1.3.') SpatialBackend = connection.ops - -from django.db import connection - -if hasattr(connection.ops, 'spatial_version'): - from warnings import warn - warn('The `django.contrib.gis.db.backend` module was refactored and ' - 'renamed to `django.contrib.gis.db.backends` in 1.2. ' - 'All functionality of `SpatialBackend` ' - 'has been moved to the `ops` attribute of the spatial database ' - 'backend. A `SpatialBackend` alias is provided here for ' - 'backwards-compatibility, but will be removed in 1.3.') - SpatialBackend = connection.ops - diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 5ecc5a1d3da..8479a32bcfa 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -17,6 +17,9 @@ their deprecation, as per the :ref:`Django deprecation policy ``supports_object_permissions`` and ``supports_anonymous_user``. The old backend style is deprecated since the 1.2 release. + * The :mod:`django.contrib.gis.db.backend` module, including the + ``SpatialBackend`` interface, is deprecated since the 1.2 release. + * 1.4 * ``CsrfResponseMiddleware``. This has been deprecated since the 1.2 release, in favour of the template tag method for inserting the CSRF