From d0d585984310634ec865c0f96e68eb78e209d7ca Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 29 Jan 2016 16:56:43 -0500 Subject: Debian already unbundles things from requests. Patch-Name: handle-unbundled-requests.patch --- 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 7e9da3e..8e76ab8 100644 --- a/pip/_vendor/__init__.py +++ b/pip/_vendor/__init__.py @@ -89,8 +89,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.six") + try: + vendored("requests.packages.urllib3.packages.ordered_dict") + vendored("requests.packages.urllib3.packages.six") + except ImportError: + # Debian already unbundles these from requests. + pass vendored("requests.packages.urllib3.packages.ssl_match_hostname") vendored("requests.packages.urllib3.packages.ssl_match_hostname." "_implementation")