[Python-modules-commits] [python-pip] 16/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 94dae9cfde37f63e41ac142b0522c0df6d859ce3
Merge: 495ddc3 95be525
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 29 17:17:49 2016 -0500

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/handle-unbundled-requests.patch | 18 ++++++++++--------
 pip/_vendor/__init__.py                        |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index a7de8c0,0000000..9ee9e04
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
- 2ea1060626fe451b8285d243893ccc8f30834b9a
- 2ea1060626fe451b8285d243893ccc8f30834b9a
++95be52582556a4aee8cf659f703c2dc9d80fb4ca
++95be52582556a4aee8cf659f703c2dc9d80fb4ca
 +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 c87d82c,0000000..7201fb5
mode 100644,000000..100644
--- a/debian/patches/handle-unbundled-requests.patch
+++ b/debian/patches/handle-unbundled-requests.patch
@@@ -1,27 -1,0 +1,29 @@@
- From 2ea1060626fe451b8285d243893ccc8f30834b9a Mon Sep 17 00:00:00 2001
++From 95be52582556a4aee8cf659f703c2dc9d80fb4ca 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.
++Subject: Debian already unbundles things from requests.
 +
 +Patch-Name: handle-unbundled-requests.patch
 +---
-  pip/_vendor/__init__.py | 6 +++++-
-  1 file changed, 5 insertions(+), 1 deletion(-)
++ pip/_vendor/__init__.py | 8 ++++++--
++ 1 file changed, 6 insertions(+), 2 deletions(-)
 +
 +diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
- index 1cb35a1..5b06004 100644
++index 1cb35a1..c64896a 100644
 +--- a/pip/_vendor/__init__.py
 ++++ b/pip/_vendor/__init__.py
- @@ -83,7 +83,11 @@ if DEBUNDLED:
++@@ -82,8 +82,12 @@ if DEBUNDLED:
++     vendored("requests.packages.urllib3.fields")
 +     vendored("requests.packages.urllib3.filepost")
 +     vendored("requests.packages.urllib3.packages")
-      vendored("requests.packages.urllib3.packages.ordered_dict")
++-    vendored("requests.packages.urllib3.packages.ordered_dict")
 +-    vendored("requests.packages.urllib3.packages.six")
 ++    try:
+++        vendored("requests.packages.urllib3.packages.ordered_dict")
 ++        vendored("requests.packages.urllib3.packages.six")
 ++    except ImportError:
- +        # Debian already unbundles six from requests.
+++        # Debian already unbundles these from requests.
 ++        pass
 +     vendored("requests.packages.urllib3.packages.ssl_match_hostname")
 +     vendored("requests.packages.urllib3.packages.ssl_match_hostname."
 +              "_implementation")

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