[Python-modules-commits] [django-polymorphic] 04/06: 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 django-polymorphic.

commit 101d1763dd964aabc7ad43cb191b1c1457b1828b
Merge: 0e10282 4a90ce1
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Oct 17 09:30:38 2016 +0200

    merge patched into master

 README.rst                                         | 13 ++++++--
 debian/.git-dpm                                    |  6 ++--
 ...0001-use-local-objects.inv-where-possible.patch |  4 +--
 docs/changelog.rst                                 | 14 +++++++++
 docs/conf.py                                       |  4 +--
 docs/quickstart.rst                                |  2 +-
 docs/third-party.rst                               | 17 +++++++++++
 polymorphic/__init__.py                            |  2 +-
 polymorphic/admin/childadmin.py                    | 15 ++++++++++
 polymorphic/base.py                                |  5 +++-
 polymorphic/contrib/__init__.py                    |  0
 polymorphic/contrib/guardian.py                    | 35 ++++++++++++++++++++++
 polymorphic/formsets/models.py                     |  7 ++---
 .../static/polymorphic/css/polymorphic_inlines.css |  1 +
 polymorphic/tests.py                               | 21 +++++++++++++
 15 files changed, 130 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 02cb11c,0000000..842bf90
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6d7069f0973de77dcb318cd72775f704fb71a616
- 6d7069f0973de77dcb318cd72775f704fb71a616
- f86decdb402bc0e7b010775090b71297ad2a7acd
++4a90ce165efb82deb0dc6517fe6165016f86f7d9
++4a90ce165efb82deb0dc6517fe6165016f86f7d9
++698c35df35f1bc7e3123674abf62a67f3e6ea81c
 +698c35df35f1bc7e3123674abf62a67f3e6ea81c
 +django-polymorphic_1.0.2.orig.tar.gz
 +06f1feec0b91cd3bac3d3ad8eccf5ddba368ac76
 +90762
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-local-objects.inv-where-possible.patch
index 9297726,0000000..eca811e
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,39 -1,0 +1,39 @@@
- From 6d7069f0973de77dcb318cd72775f704fb71a616 Mon Sep 17 00:00:00 2001
++From 4a90ce165efb82deb0dc6517fe6165016f86f7d9 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Sun, 21 Aug 2016 13:17:22 +0200
 +Subject: use local objects.inv where possible
 +
 +Upstream uses intersphinx mappings that fetch the objects.inv for python django
 +through HTTP from a remote host. Using the local objects.inv from python and
 +django enables the package to build without network connection.
 +---
 + docs/conf.py | 19 ++++++++++++++-----
 + 1 file changed, 14 insertions(+), 5 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 6bada59..a5bb377 100644
++index f14fa5f..e826275 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -249,8 +249,17 @@ texinfo_documents = [
 + #texinfo_show_urls = 'footnote'
 + 
 + 
 +-# Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {
 +-    #'http://docs.python.org/': None,
 +-    'https://docs.djangoproject.com/en/dev': 'https://docs.djangoproject.com/en/dev/_objects',
 +-}
 ++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/',
 ++                                             '/usr/share/doc/python'
 ++                                             + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                             + '/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('django',
 ++                                             'https://docs.djangoproject.com/en/dev',
 ++                                             '/usr/share/doc/python-django-doc/html/objects.inv'))

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