[Python-modules-commits] [python-pip] 14/16: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-pip.

commit 495ddc343d3abd1b7ffbac0d249e26cd66f96958
Merge: 0f0ffd7 2ea1060
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 29 16:57:11 2016 -0500

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/handle-unbundled-requests.patch | 27 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 pip/_vendor/__init__.py                        |  6 +++++-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7d90b0c,0000000..a7de8c0
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
- bf860692b3d9c96ffa0cd1eb24dee042eae2f1f3
- bf860692b3d9c96ffa0cd1eb24dee042eae2f1f3
++2ea1060626fe451b8285d243893ccc8f30834b9a
++2ea1060626fe451b8285d243893ccc8f30834b9a
 +c9fd1b7c41802c64663a7a4646bf9b546f2389e2
 +c9fd1b7c41802c64663a7a4646bf9b546f2389e2
 +python-pip_8.0.2.orig.tar.gz
 +974a8c345d272b9d9072287f399aab8410067f7e
 +1130183
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/handle-unbundled-requests.patch
index 0000000,0000000..c87d82c
new file mode 100644
--- /dev/null
+++ b/debian/patches/handle-unbundled-requests.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 2ea1060626fe451b8285d243893ccc8f30834b9a Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 29 Jan 2016 16:56:43 -0500
++Subject: Debian already unbundles six from requests.
++
++Patch-Name: handle-unbundled-requests.patch
++---
++ pip/_vendor/__init__.py | 6 +++++-
++ 1 file changed, 5 insertions(+), 1 deletion(-)
++
++diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
++index 1cb35a1..5b06004 100644
++--- a/pip/_vendor/__init__.py
+++++ b/pip/_vendor/__init__.py
++@@ -83,7 +83,11 @@ if DEBUNDLED:
++     vendored("requests.packages.urllib3.filepost")
++     vendored("requests.packages.urllib3.packages")
++     vendored("requests.packages.urllib3.packages.ordered_dict")
++-    vendored("requests.packages.urllib3.packages.six")
+++    try:
+++        vendored("requests.packages.urllib3.packages.six")
+++    except ImportError:
+++        # Debian already unbundles six from requests.
+++        pass
++     vendored("requests.packages.urllib3.packages.ssl_match_hostname")
++     vendored("requests.packages.urllib3.packages.ssl_match_hostname."
++              "_implementation")
diff --cc debian/patches/series
index 6895543,0000000..ecbcd26
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +hands-off-system-packages.patch
 +debundle.patch
++handle-unbundled-requests.patch

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