Do not crash with bundled urllib3

This commit is contained in:
Laurent Bachelier 2015-01-01 01:12:09 +01:00
commit 2c53edd5ac

View file

@ -20,7 +20,10 @@
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import re import re
import urllib3 try:
import urllib3
except ImportError:
from requests.packages import urllib3
try: try:
from urllib.parse import urlparse, urljoin from urllib.parse import urlparse, urljoin
except ImportError: except ImportError: