From 396963ac7eb8078bae5c30d9cf596debef892c3d Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 30 Dec 2015 10:40:12 +0000 Subject: [PATCH] Temporary urllib3 patch --- requests/packages/urllib3/__init__.py | 3 +-- requests/packages/urllib3/contrib/socks.py | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/requests/packages/urllib3/__init__.py b/requests/packages/urllib3/__init__.py index b744315b..a5ad1332 100644 --- a/requests/packages/urllib3/__init__.py +++ b/requests/packages/urllib3/__init__.py @@ -1,7 +1,6 @@ """ urllib3 - Thread-safe connection pooling and re-using. """ - from __future__ import absolute_import import warnings @@ -32,7 +31,7 @@ except ImportError: __author__ = 'Andrey Petrov (andrey.petrov@shazow.net)' __license__ = 'MIT' -__version__ = '1.14' +__version__ = 'dev' __all__ = ( 'HTTPConnectionPool', diff --git a/requests/packages/urllib3/contrib/socks.py b/requests/packages/urllib3/contrib/socks.py index 885776c3..3748fee5 100644 --- a/requests/packages/urllib3/contrib/socks.py +++ b/requests/packages/urllib3/contrib/socks.py @@ -21,7 +21,7 @@ try: import socks except ImportError: import warnings - from urllib3.exceptions import DependencyWarning + from ..exceptions import DependencyWarning warnings.warn(( 'SOCKS support in urllib3 requires the installation of optional ' @@ -34,15 +34,15 @@ except ImportError: from socket import error as SocketError, timeout as SocketTimeout -from urllib3.connection import ( +from ..connection import ( HTTPConnection, HTTPSConnection ) -from urllib3.connectionpool import ( +from ..connectionpool import ( HTTPConnectionPool, HTTPSConnectionPool ) -from urllib3.exceptions import ConnectTimeoutError, NewConnectionError -from urllib3.poolmanager import PoolManager -from urllib3.util.url import parse_url +from ..exceptions import ConnectTimeoutError, NewConnectionError +from ..poolmanager import PoolManager +from ..util.url import parse_url try: import ssl