[Python-modules-commits] [python-pip] 13/16: Debian already unbundles six from requests.

[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 2ea1060626fe451b8285d243893ccc8f30834b9a
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 29 16:56:43 2016 -0500

    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")

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