diff options
author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:19:31 -0700 |
---|---|---|
committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:19:31 -0700 |
commit | 77245469d4fbd400c6702cde35f9d9002540663e (patch) | |
tree | 5bbc97fd683f8f7354204d24be7974b268b19531 /urllib3/__init__.py | |
parent | 0c183b9d52b45bac22a2ff9db0e6348b655f4ab2 (diff) | |
download | python-urllib3-77245469d4fbd400c6702cde35f9d9002540663e.tar python-urllib3-77245469d4fbd400c6702cde35f9d9002540663e.tar.gz |
Imported Upstream version 1.3
Diffstat (limited to 'urllib3/__init__.py')
-rw-r--r-- | urllib3/__init__.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/urllib3/__init__.py b/urllib3/__init__.py index 2e9c663..2d6fece 100644 --- a/urllib3/__init__.py +++ b/urllib3/__init__.py @@ -10,26 +10,20 @@ urllib3 - Thread-safe connection pooling and re-using. __author__ = 'Andrey Petrov (andrey.petrov@shazow.net)' __license__ = 'MIT' -__version__ = '1.2.2' +__version__ = '1.3' from .connectionpool import ( HTTPConnectionPool, HTTPSConnectionPool, - connection_from_url, - get_host, - make_headers) - - -from .exceptions import ( - HTTPError, - MaxRetryError, - SSLError, - TimeoutError) + connection_from_url +) +from . import exceptions +from .filepost import encode_multipart_formdata from .poolmanager import PoolManager, ProxyManager, proxy_from_url from .response import HTTPResponse -from .filepost import encode_multipart_formdata +from .util import make_headers, get_host # Set default logging handler to avoid "No handler found" warnings. |