| Index: third_party/requests/compat.py
|
| diff --git a/third_party/requests/compat.py b/third_party/requests/compat.py
|
| index bcf94b00670604269a8e5bf60ddbb517c8caf4f9..0d61a572df619d5538c6db07af3b9db60d65f587 100644
|
| --- a/third_party/requests/compat.py
|
| +++ b/third_party/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
|
|
|