mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Refs #25665 -- Removed GEOSGeometry.get/set_srid() per deprecation timeline.

Browse Source
This commit is contained in:
Tim Graham 2016-12-31 09:33:40 -05:00
parent ed251246cc
commit a0149848f7
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/contrib/gis/geos/geometry.py
View File

@ -5,7 +5,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
import warnings
from ctypes import addressof, byref, c_double from ctypes import addressof, byref, c_double
from django.contrib.gis import gdal from django.contrib.gis import gdal
@ -22,7 +21,6 @@ from django.contrib.gis.geos.prototypes.io import (
) )
from django.utils import six from django.utils import six
from django.utils.deconstruct import deconstructible from django.utils.deconstruct import deconstructible
from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.encoding import force_bytes, force_text from django.utils.encoding import force_bytes, force_text
@ -385,20 +383,6 @@ class GEOSGeometry(GEOSBase, ListMixin):
"Sets the SRID for the geometry." "Sets the SRID for the geometry."
capi.geos_set_srid(self.ptr, 0 if srid is None else srid) capi.geos_set_srid(self.ptr, 0 if srid is None else srid)
def get_srid(self):
warnings.warn(
"`get_srid()` is deprecated, use the `srid` property instead.",
RemovedInDjango20Warning, 2
)
return self.srid
def set_srid(self, srid):
warnings.warn(
"`set_srid()` is deprecated, use the `srid` property instead.",
RemovedInDjango20Warning, 2
)
self.srid = srid
# #### Output Routines #### # #### Output Routines ####
@property @property
def ewkt(self): def ewkt(self):

3
docs/releases/2.0.txt
View File

@ -324,3 +324,6 @@ these features.
* Support for direct assignment to a reverse foreign key or many-to-many * Support for direct assignment to a reverse foreign key or many-to-many
relation is removed. relation is removed.
* The ``get_srid()`` and ``set_srid()`` methods of
``django.contrib.gis.geos.GEOSGeometry`` are removed.

8
tests/gis_tests/geos_tests/test_geos.py
View File

@ -1316,14 +1316,6 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
p.transform(2774) p.transform(2774)
self.assertEqual(p, Point(srid=2774)) self.assertEqual(p, Point(srid=2774))
@ignore_warnings(category=RemovedInDjango20Warning)
def test_deprecated_srid_getters_setters(self):
p = Point(1, 2, srid=123)
self.assertEqual(p.get_srid(), p.srid)
p.set_srid(321)
self.assertEqual(p.srid, 321)
@ignore_warnings(category=RemovedInDjango20Warning) @ignore_warnings(category=RemovedInDjango20Warning)
def test_deprecated_point_coordinate_getters_setters(self): def test_deprecated_point_coordinate_getters_setters(self):
p = Point(1, 2, 3) p = Point(1, 2, 3)