mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 18:30:48 +00:00
Code Issues 32 Releases Wiki Activity

Removed django.contrib.gis.geoip2.GeoIP2.coords() per deprecation timeline.

Browse Source
This commit is contained in:
Sarah Boyce 2024-12-13 09:08:03 +01:00
parent f3a2509a54
commit 4104dafdf3
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/gis/geoip2.py
View File

@ -214,15 +214,6 @@ class GeoIP2:
"is_in_european_union": response.country.is_in_european_union, "is_in_european_union": response.country.is_in_european_union,
} }
def coords(self, query, ordering=("longitude", "latitude")):
warnings.warn(
"GeoIP2.coords() is deprecated. Use GeoIP2.lon_lat() instead.",
RemovedInDjango60Warning,
stacklevel=2,
)
data = self.city(query)
return tuple(data[o] for o in ordering)
def lon_lat(self, query): def lon_lat(self, query):
"Return a tuple of the (longitude, latitude) for the given query." "Return a tuple of the (longitude, latitude) for the given query."
data = self.city(query) data = self.city(query)

8
docs/ref/contrib/gis/geoip2.txt
View File

@ -141,14 +141,6 @@ Returns the country name corresponding to the query.
Coordinate Retrieval Coordinate Retrieval
-------------------- --------------------
.. method:: GeoIP2.coords(query)
Returns a coordinate tuple of (longitude, latitude).
.. deprecated:: 5.1
Use :meth:`.GeoIP2.lon_lat` instead.
.. method:: GeoIP2.lon_lat(query) .. method:: GeoIP2.lon_lat(query)
Returns a coordinate tuple of (longitude, latitude). Returns a coordinate tuple of (longitude, latitude).

2
docs/releases/6.0.txt
View File

@ -305,3 +305,5 @@ to remove usage of these features.
* The undocumented ``django.utils.itercompat.is_iterable()`` function and the * The undocumented ``django.utils.itercompat.is_iterable()`` function and the
``django.utils.itercompat`` module is removed. ``django.utils.itercompat`` module is removed.
* The ``django.contrib.gis.geoip2.GeoIP2.coords()`` method is removed.

9
tests/gis_tests/test_geoip2.py
View File

@ -201,15 +201,6 @@ class GeoLite2Test(SimpleTestCase):
version = f"{m.binary_format_major_version}.{m.binary_format_minor_version}" version = f"{m.binary_format_major_version}.{m.binary_format_minor_version}"
self.assertEqual(repr(g), f"<GeoIP2 [v{version}] _path='{g._path}'>") self.assertEqual(repr(g), f"<GeoIP2 [v{version}] _path='{g._path}'>")
def test_coords_deprecation_warning(self):
g = GeoIP2()
msg = "GeoIP2.coords() is deprecated. Use GeoIP2.lon_lat() instead."
with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx:
e1, e2 = g.coords(self.ipv4_str)
self.assertIsInstance(e1, float)
self.assertIsInstance(e2, float)
self.assertEqual(ctx.filename, __file__)
def test_open_deprecation_warning(self): def test_open_deprecation_warning(self):
msg = "GeoIP2.open() is deprecated. Use GeoIP2() instead." msg = "GeoIP2.open() is deprecated. Use GeoIP2() instead."
with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: