From dd8b39b29ed1850d64dab6ae85cacd6fe4065bc3 Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Thu, 15 Oct 2015 14:56:30 +1100 Subject: [PATCH] Fallback to importing from urllib3 requests.packages.urllib3 may be literally urllib3 instead of vendored urllib3. --- vcr/stubs/requests_stubs.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vcr/stubs/requests_stubs.py b/vcr/stubs/requests_stubs.py index d061712..30e960f 100644 --- a/vcr/stubs/requests_stubs.py +++ b/vcr/stubs/requests_stubs.py @@ -1,6 +1,10 @@ '''Stubs for requests''' -from requests.packages.urllib3.connectionpool import HTTPConnection, VerifiedHTTPSConnection +try: + from requests.packages.urllib3.connectionpool import HTTPConnection, VerifiedHTTPSConnection +except ImportError: + from urllib3.connectionpool import HTTPConnection, VerifiedHTTPSConnection + from ..stubs import VCRHTTPConnection, VCRHTTPSConnection # urllib3 defines its own HTTPConnection classes, which requests goes ahead and assumes