From 2c53edd5acfe90bb7b4d4d399e70c55d6d90cded Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Thu, 1 Jan 2015 01:12:09 +0100 Subject: [PATCH] Do not crash with bundled urllib3 --- weboob/browser/browsers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/weboob/browser/browsers.py b/weboob/browser/browsers.py index e3f46e20..b09bbace 100644 --- a/weboob/browser/browsers.py +++ b/weboob/browser/browsers.py @@ -20,7 +20,10 @@ from __future__ import absolute_import, print_function import re -import urllib3 +try: + import urllib3 +except ImportError: + from requests.packages import urllib3 try: from urllib.parse import urlparse, urljoin except ImportError: