summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNick Pope <nick@nickpope.me.uk>2024-01-07 07:15:40 +0000
committerGitHub <noreply@github.com>2024-01-07 08:15:40 +0100
commitcc56c22a24ef717cc3111e92ca146136fa518d55 (patch)
treeaca8f9142cbb55c63895c420e7a6bf387811e47f /docs
parent53fc6ac64976a7693d2272050a03b71e56b16578 (diff)
Fixed #35091 -- Allowed GeoIP2 querying using IPv4Address/IPv6Address.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geoip2.txt9
-rw-r--r--docs/releases/5.1.txt3
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index aca31bf78b..1d27e39657 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -107,10 +107,11 @@ and given cache setting.
Querying
--------
-All the following querying routines may take either a string IP address
-or a fully qualified domain name (FQDN). For example, both
-``'205.186.163.125'`` and ``'djangoproject.com'`` would be valid query
-parameters.
+All the following querying routines may take an instance of
+:class:`~ipaddress.IPv4Address` or :class:`~ipaddress.IPv6Address`, a string IP
+address, or a fully qualified domain name (FQDN). For example,
+``IPv4Address("205.186.163.125")``, ``"205.186.163.125"``, and
+``"djangoproject.com"`` would all be valid query parameters.
.. method:: GeoIP2.city(query)
diff --git a/docs/releases/5.1.txt b/docs/releases/5.1.txt
index e84a27a0ec..d458811471 100644
--- a/docs/releases/5.1.txt
+++ b/docs/releases/5.1.txt
@@ -59,6 +59,9 @@ Minor features
* :class:`~django.contrib.gis.db.models.Collect` is now supported on MySQL
8.0.24+.
+* :class:`~django.contrib.gis.geoip2.GeoIP2` now allows querying using
+ :class:`ipaddress.IPv4Address` or :class:`ipaddress.IPv6Address` objects.
+
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~