summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2019-08-10 11:55:22 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-08-13 19:44:10 +0200
commiteed2e740f7efa9a9290fb913f796437e2c4adc5f (patch)
tree9dd13dd5d3e7f6a53196b63c37c758eebaa55e70 /docs
parent88c0b907e76bccfe1a25dc6580272b07aebd45d6 (diff)
Fixed #30461 -- Made GeoIP2 and GEOIP_PATH setting accept pathlib.Path as library path.
Thanks Nikita Krokosh for the initial patch.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geoip2.txt12
-rw-r--r--docs/releases/3.0.txt5
2 files changed, 15 insertions, 2 deletions
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 2dc3dff526..abf0a7ca91 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -86,6 +86,10 @@ Keyword Arguments Description
the :setting:`GEOIP_CITY` setting.
=================== =======================================================
+.. versionchanged:: 3.0
+
+ Support for :class:`pathlib.Path` ``path`` was added.
+
Methods
=======
@@ -151,10 +155,14 @@ Settings
``GEOIP_PATH``
--------------
-A string specifying the directory where the GeoIP data files are
-located. This setting is *required* unless manually specified
+A string or :class:`pathlib.Path` specifying the directory where the GeoIP data
+files are located. This setting is *required* unless manually specified
with ``path`` keyword when initializing the :class:`GeoIP2` object.
+.. versionchanged:: 3.0
+
+ Support for :class:`pathlib.Path` was added.
+
.. setting:: GEOIP_COUNTRY
``GEOIP_COUNTRY``
diff --git a/docs/releases/3.0.txt b/docs/releases/3.0.txt
index ad303ede3e..42f4c72495 100644
--- a/docs/releases/3.0.txt
+++ b/docs/releases/3.0.txt
@@ -133,6 +133,11 @@ Minor features
* Added support for the ``furlong`` unit in
:class:`~django.contrib.gis.measure.Distance`.
+* The :setting:`GEOIP_PATH` setting now supports :class:`pathlib.Path`.
+
+* The :class:`~django.contrib.gis.geoip2.GeoIP2` class now accepts
+ :class:`pathlib.Path` ``path``.
+
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~