diff options
author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:29 -0700 |
---|---|---|
committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:29 -0700 |
commit | 224200a9815f792f93632d03a38e4f0763ae69ef (patch) | |
tree | 161977259a7d8aa262aab60d7c8fce757ad3bb0f /requests/compat.py | |
parent | 653256249d44c67a0852d57a166948a9dc712ef4 (diff) | |
download | python-requests-224200a9815f792f93632d03a38e4f0763ae69ef.tar python-requests-224200a9815f792f93632d03a38e4f0763ae69ef.tar.gz |
Imported Upstream version 2.0.0
Diffstat (limited to 'requests/compat.py')
-rw-r--r-- | requests/compat.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/requests/compat.py b/requests/compat.py index bcf94b0..0d61a57 100644 --- a/requests/compat.py +++ b/requests/compat.py @@ -83,13 +83,14 @@ except ImportError: # --------- if is_py2: - from urllib import quote, unquote, quote_plus, unquote_plus, urlencode + from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag from urllib2 import parse_http_list import cookielib from Cookie import Morsel from StringIO import StringIO from .packages.urllib3.packages.ordered_dict import OrderedDict + from httplib import IncompleteRead builtin_str = str bytes = str @@ -100,11 +101,12 @@ if is_py2: elif is_py3: from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag - from urllib.request import parse_http_list + from urllib.request import parse_http_list, getproxies, proxy_bypass from http import cookiejar as cookielib from http.cookies import Morsel from io import StringIO from collections import OrderedDict + from http.client import IncompleteRead builtin_str = str str = str |