kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Help @sigmavirus24 with code golf.

Browse Source
This commit is contained in:
Cory Benfield
2015-12-30 16:45:51 +00:00
parent 11b9b24ac9
commit e4d15c4649
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/adapters.py
+8 -9
View File
@@ -303,17 +303,16 @@ class HTTPAdapter(BaseAdapter):
"""
proxy = select_proxy(request.url, proxies)
scheme = urlparse(request.url).scheme
proxy_scheme = ''
if proxy:
proxy_scheme = urlparse(proxy).scheme
if proxy and proxy_scheme.lower().startswith('socks'):
# Socks proxies behave like the proxy isn't there at all.
url = request.path_url
elif proxy and scheme != 'https':
is_proxied_http_request = (proxy and scheme != 'https')
using_socks_proxy = False
if proxy:
proxy_scheme = urlparse(proxy).scheme.lower()
using_socks_proxy = proxy_scheme.startswith('socks')
url = request.path_url
if is_proxied_http_request and not using_socks_proxy:
url = urldefragauth(request.url)
else:
url = request.path_url
return url