[Python-modules-commits] [python-django] 01/01: Unapply patches and disable git-dpm

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/master
in repository python-django.

commit b8ab3bae784e68da9fd723030a1f6d3ff6f375fa
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Sat May 20 15:51:21 2017 +0200

    Unapply patches and disable git-dpm
---
 debian/.git-dpm                  | 11 -----------
 django/contrib/gis/geoip/base.py | 19 +++++++++----------
 docs/conf.py                     |  5 +----
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index b6f8ad1..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-0e464e28dd41c3a8d8fc0f3317650ec4e029b8c5
-0e464e28dd41c3a8d8fc0f3317650ec4e029b8c5
-f18dfc589f0b4a909be9e0cdcf48b70b4f3a7e4e
-f18dfc589f0b4a909be9e0cdcf48b70b4f3a7e4e
-python-django_1.10.7.orig.tar.gz
-5edd13a642460c33cdaf8e8166eccf6b2a2555df
-7737654
-debianTag="debian/%e%%%v"
-patchedTag="debian/patches/%e%%%v"
-upstreamTag="upstream/%e%%%u"
diff --git a/django/contrib/gis/geoip/base.py b/django/contrib/gis/geoip/base.py
index 1e33033..d40ae7e 100644
--- a/django/contrib/gis/geoip/base.py
+++ b/django/contrib/gis/geoip/base.py
@@ -68,8 +68,7 @@ class GeoIP(object):
         * path: Base directory to where GeoIP data is located or the full path
             to where the city or country data files (*.dat) are located.
             Assumes that both the city and country data sets are located in
-            this directory. Overrides the GEOIP_PATH settings attribute.
-            If neither is set, defaults to '/usr/share/GeoIP'.
+            this directory; overrides the GEOIP_PATH settings attribute.
 
         * cache: The cache settings when opening up the GeoIP datasets,
             and may be an integer in (0, 1, 2, 4, 8) corresponding to
@@ -78,13 +77,11 @@ class GeoIP(object):
             settings,  respectively.  Defaults to 0, meaning that the data is read
             from the disk.
 
-        * country: The name of the GeoIP country data file. Overrides
-            the GEOIP_COUNTRY settings attribute. If neither is set,
-            defaults to 'GeoIP.dat'
+        * country: The name of the GeoIP country data file.  Defaults to
+            'GeoIP.dat'; overrides the GEOIP_COUNTRY settings attribute.
 
-        * city: The name of the GeoIP city data file. Overrides the
-            GEOIP_CITY settings attribute. If neither is set, defaults
-            to 'GeoIPCity.dat'.
+        * city: The name of the GeoIP city data file.  Defaults to
+            'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute.
         """
 
         warnings.warn(
@@ -101,7 +98,9 @@ class GeoIP(object):
 
         # Getting the GeoIP data path.
         if not path:
-            path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
+            path = GEOIP_SETTINGS.get('GEOIP_PATH')
+            if not path:
+                raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
         if not isinstance(path, six.string_types):
             raise TypeError('Invalid path type: %s' % type(path).__name__)
 
@@ -114,7 +113,7 @@ class GeoIP(object):
                 self._country = GeoIP_open(force_bytes(country_db), cache)
                 self._country_file = country_db
 
-            city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoIPCity.dat'))
+            city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
             if os.path.isfile(city_db):
                 self._city = GeoIP_open(force_bytes(city_db), cache)
                 self._city_file = city_db
diff --git a/docs/conf.py b/docs/conf.py
index 5b1fab2..5f57ce5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -212,10 +212,7 @@ html_additional_pages = {}
 # html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-html_show_sourcelink = False
-
-# Do not ship a copy of the sources
-html_copy_source = False
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 # html_show_sphinx = True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git