Temporary urllib3 patch

This commit is contained in:
Cory Benfield
2015-12-30 10:40:12 +00:00
parent cd84b3ff94
commit 396963ac7e
2 changed files with 7 additions and 8 deletions
+1 -2
View File
@@ -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',
+6 -6
View File
@@ -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