diff options
| author | Flavio Curella <flavio.curella@gmail.com> | 2015-07-30 12:24:08 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-07-31 10:09:06 -0400 |
| commit | 1e2362ca0f2805e91204a7b005e5aed293b40c9e (patch) | |
| tree | 9e772d65e7d63f3d222f900860a81fab46376fdf /docs | |
| parent | 7f0953ce1f1e263a2a74db52d70cdf278840a1d2 (diff) | |
Refs #25184 -- Started deprecation for contrib.gis.geoip.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geoip.txt | 6 | ||||
| -rw-r--r-- | docs/releases/1.9.txt | 7 |
3 files changed, 15 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 4a14acd734..cc1495efee 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -45,6 +45,8 @@ details on these changes. * The ``GeoManager`` and ``GeoQuerySet`` classes will be removed. +* The ``django.contrib.gis.geoip`` module will be removed. + * The ``supports_recursion`` check for template loaders will be removed from: * ``django.template.engine.Engine.find_template()`` diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt index 0fb7fde99c..efe33ebef3 100644 --- a/docs/ref/contrib/gis/geoip.txt +++ b/docs/ref/contrib/gis/geoip.txt @@ -5,6 +5,12 @@ Geolocation with GeoIP .. module:: django.contrib.gis.geoip :synopsis: High-level Python interface for MaxMind's GeoIP C library. +.. deprecated:: 1.9 + + This module is deprecated in favor of :doc:`django.contrib.gis.geoip2 + </ref/contrib/gis/geoip2>`, which supports IPv6 and the GeoLite2 database + format. + The :class:`GeoIP` object is a ctypes wrapper for the `MaxMind GeoIP C API`__. [#]_ diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index 6d482038af..82ff5a08bc 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -1049,6 +1049,13 @@ As of Django 1.8, ``current_app`` is set on the ``request`` object. For consistency, these views will require the caller to set ``current_app`` on the ``request`` instead of passing it in a separate argument. +``django.contrib.gis.geoip`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The :mod:`django.contrib.gis.geoip2` module supersedes +``django.contrib.gis.geoip``. The new module provides a similar API except that +it doesn't provide the legacy GeoIP-Python API compatibility methods. + Miscellaneous ~~~~~~~~~~~~~ |