[Python-modules-commits] [django-polymorphic] 04/15: 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 227d9e3cf55c7f6b49d361f51af922df9dc29715
Merge: 783ad4a 6a840ca
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Sep 12 08:31:09 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  6 +++---
 ...0001-use-local-objects.inv-where-possible.patch |  2 +-
 ...-managers-only-works-for-abstract-classes.patch | 25 ----------------------
 debian/patches/series                              |  1 -
 docs/changelog.rst                                 |  6 ++++++
 polymorphic/__init__.py                            |  2 +-
 polymorphic/base.py                                |  5 ++++-
 polymorphic/tests.py                               | 16 ++++++++------
 8 files changed, 24 insertions(+), 39 deletions(-)

diff --cc debian/.git-dpm
index 4761439,0000000..634e85a
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
- 6b4c202531856fd61faa92f1ab83893c6ffbe886
- 6b4c202531856fd61faa92f1ab83893c6ffbe886
- 9cbbfe8633539f380d08c18903622880496bcbee
++6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f
++6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f
++ad969467f02701e13bdb4ad359c84cfcf72b621e
 +ad969467f02701e13bdb4ad359c84cfcf72b621e
 +django-polymorphic_1.0.1.orig.tar.gz
 +9fb1cd6b48e1372b9e350d27241b9b15cca5d70a
 +89538
 +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 54bb979,0000000..7c1556d
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 7c06e18c7a99cafe5c276c9ea57dfb63c1796644 Mon Sep 17 00:00:00 2001
++From 6a840ca84a4e6984818941d4ba0b75a6a4cf9c8f 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
 +--- 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'))
diff --cc debian/patches/series
index 5ae6aef,0000000..7f0b5b6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +0001-use-local-objects.inv-where-possible.patch
- 0002-Inheriting-managers-only-works-for-abstract-classes.patch

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