[Python-modules-commits] [mockldap] 04/18: merge patched-experimental into experimental

[Michael Fladischer]

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

fladi pushed a commit to branch experimental
in repository mockldap.

commit 018ae0c8a80ea207af0c874bb8c74cd69fa420ab
Merge: 0cff37f ecf59c3
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Mar 17 20:44:50 2017 +0100

    merge patched-experimental into experimental

 CHANGES                                            | 12 +++++++++
 PKG-INFO                                           | 19 ++++++-------
 README                                             |  6 ++---
 debian/.git-dpm                                    |  6 ++---
 .../docs-use_local_intersphinx_mapping.patch       |  4 +--
 docs/source/conf.py                                |  4 +--
 docs/source/overview.rst                           | 12 ++++-----
 setup.py                                           | 20 +++++++++-----
 src/mockldap.egg-info/PKG-INFO                     | 19 ++++++-------
 src/mockldap.egg-info/requires.txt                 |  2 +-
 src/mockldap/__init__.py                           |  2 ++
 src/mockldap/filter.py                             |  2 ++
 src/mockldap/ldapobject.py                         |  6 ++---
 src/mockldap/recording.py                          |  2 ++
 src/mockldap/tests.py                              | 31 ++++++++++++----------
 15 files changed, 88 insertions(+), 59 deletions(-)

diff --cc debian/.git-dpm
index 565de31,0000000..37652e3
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
- 5551948cd1a4ff0521736b8095fecb7217861b5c
- 5551948cd1a4ff0521736b8095fecb7217861b5c
- a6679e4cc2ccd267e6c6f28090a3ec457fe176fe
++ecf59c3ebc968f659d31c6ca4c9ecf380924b58b
++ecf59c3ebc968f659d31c6ca4c9ecf380924b58b
++9e0bc8a3f542ba798498d1ceefde5ed3f6f64314
 +9e0bc8a3f542ba798498d1ceefde5ed3f6f64314
 +mockldap_0.2.7.orig.tar.gz
 +2f46b9da015e5509ae37dc47b43f88f80c0d30e2
 +22903
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/docs-use_local_intersphinx_mapping.patch
index c5638b6,0000000..ca8fa0d
mode 100644,000000..100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@@ -1,49 -1,0 +1,49 @@@
- From 5551948cd1a4ff0521736b8095fecb7217861b5c Mon Sep 17 00:00:00 2001
++From ecf59c3ebc968f659d31c6ca4c9ecf380924b58b Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 09:52:32 -0700
 +Subject: use local objects.inv where possible
 +
 + Upstream uses intersphinx mappings that fetch the objects.inv for python and
 + python-mock by HTTP from a remote host. Using the local objects.inv from
 + python and python-mock enables the package to build without network connection.
 +Last-Update: 2013-12-03
 +Forwarded: not-needed
 +
 +Patch-Name: docs-use_local_intersphinx_mapping.patch
 +---
 + docs/source/conf.py | 22 +++++++++++++++++-----
 + 1 file changed, 17 insertions(+), 5 deletions(-)
 +
 +diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 789e0ca..bd3e9ae 100644
++index 1e49183..d9921c4 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -32,11 +32,23 @@ extensions = [
 +     'sphinx.ext.viewcode',
 + ]
 + 
 +-intersphinx_mapping = {
 +-    'python': ('http://docs.python.org/2/', 'http://docs.python.org/2/objects.inv'),
 +-    'ldap': ('http://python-ldap.org/doc/html/', None),
 +-    'mock': ('http://www.voidspace.org.uk/python/mock/', 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/',
 ++                                            '/usr/share/doc/python'
 ++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                              + '/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('ldap',
 ++                                             'http://python-ldap.org/doc/html/',
 ++                                             ''))
 ++intersphinx_mapping.update(check_object_path('mock',
 ++                                             'http://www.voidspace.org.uk/python/mock/',
 ++                                             '/usr/share/doc/python-mock-doc/html/objects.inv'))
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']

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