[Python-modules-commits] [mockldap] 08/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 bf47263cf063f82a813e1bdbcd52a54c35d29c71
Merge: 51448c7 68abde3
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Mar 17 21:26:33 2017 +0100

    merge patched-experimental into experimental

 debian/.git-dpm                                    |  4 +--
 ...2-Use-pyldap-for-both-Python2-and-Python3.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 +--
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 37652e3,0000000..0eab2b4
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
- ecf59c3ebc968f659d31c6ca4c9ecf380924b58b
- ecf59c3ebc968f659d31c6ca4c9ecf380924b58b
++68abde3da3e2e208de5be75e69a10fcdcf341b75
++68abde3da3e2e208de5be75e69a10fcdcf341b75
 +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/0002-Use-pyldap-for-both-Python2-and-Python3.patch
index 0000000,0000000..8644901
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-pyldap-for-both-Python2-and-Python3.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 68abde3da3e2e208de5be75e69a10fcdcf341b75 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 17 Mar 2017 21:26:14 +0100
++Subject: Use pyldap for both Python2 and Python3.
++
++---
++ setup.py | 4 +---
++ 1 file changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 7d827f6..303478e 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -5,8 +5,6 @@ import sys
++ from setuptools import setup
++ 
++ 
++-PY3 = (sys.version_info[0] == 3)
++-
++ try:
++     import unittest.mock    # noqa
++ except ImportError:
++@@ -53,7 +51,7 @@ setup(
++     ],
++     keywords=['mock', 'ldap'],
++     install_requires=[
++-        'pyldap' if PY3 else 'python-ldap',
+++        'pyldap',
++         'funcparserlib==0.3.6',
++     ] + requires_mock,
++     extras_require={
diff --cc debian/patches/series
index 757e88b,0000000..e392860
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +docs-use_local_intersphinx_mapping.patch
++0002-Use-pyldap-for-both-Python2-and-Python3.patch

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