[Python-modules-commits] [python-django-extra-views] 10/11: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-django-extra-views.

commit 5b3bac05a1d3aa908edaf5818c6e14b029384b24
Merge: 150af46 90a87c9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 11:23:30 2017 +0100

    merge patched into master

 debian/.git-dpm                                                | 4 ++--
 debian/patches/0001-Use-local-objects.inv-where-possible.patch | 8 ++++----
 docs/conf.py                                                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 4edbe35,0000000..7f6808f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 11daf9e2de3e9600c8ab664e0f26298a9e39d244
- 11daf9e2de3e9600c8ab664e0f26298a9e39d244
++90a87c9d7729a46c65c9bdd33f25c570a54a83c9
++90a87c9d7729a46c65c9bdd33f25c570a54a83c9
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +python-django-extra-views_0.9.0.orig.tar.gz
 +838d610f7e590c64ae9bce619332e400da97cbc2
 +25744
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index 939379f,0000000..2c6aed2
mode 100644,000000..100644
--- a/debian/patches/0001-Use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-Use-local-objects.inv-where-possible.patch
@@@ -1,35 -1,0 +1,35 @@@
- From 11daf9e2de3e9600c8ab664e0f26298a9e39d244 Mon Sep 17 00:00:00 2001
++From 90a87c9d7729a46c65c9bdd33f25c570a54a83c9 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Thu, 16 Mar 2017 11:17:23 +0100
 +Subject: Use local objects.inv where possible.
 +
 +---
 + docs/conf.py | 18 +++++++++++++++++-
 + 1 file changed, 17 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 01bf0f0..010c6e0 100644
++index 01bf0f0..4dcf10b 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -247,4 +247,20 @@ texinfo_documents = [
 + 
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'http://docs.python.org/': None}
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 ++
 ++intersphinx_mapping = {}
 ++intersphinx_mapping.update(
 ++    check_object_path(
 ++        'python',
 ++        'http://docs.python.org/{v}/'.format(
- +            v='.'.join(map(str, sys.version_info[:2]]))
+++            v='.'.join(map(str, sys.version_info[:2]))
 ++        ),
 ++        '/usr/share/doc/python{v}/html/objects.inv'.format(
- +            v='.'.join(map(str, sys.version_info[:2]]))
+++            v='.'.join(map(str, sys.version_info[:2]))
 ++        )
 ++    )
 ++)

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