mirror of https://github.com/python/cpython
Fix closes issue12698 - make the no_proxy environment variable handling a bit lenient (accomodate spaces in between the items)
This commit is contained in:
parent
e5cad23a92
commit
89976f1cdc
|
@ -135,7 +135,9 @@ class ProxyTests(unittest.TestCase):
|
|||
proxies = urllib.request.getproxies_environment()
|
||||
# getproxies_environment use lowered case truncated (no '_proxy') keys
|
||||
self.assertEqual('localhost', proxies['no'])
|
||||
|
||||
# List of no_proxies with space.
|
||||
self.env.set('NO_PROXY', 'localhost, anotherdomain.com, newdomain.com')
|
||||
self.assertTrue(urllib.request.proxy_bypass_environment('anotherdomain.com'))
|
||||
|
||||
class urlopen_HttpTests(unittest.TestCase):
|
||||
"""Test urlopen() opening a fake http connection."""
|
||||
|
|
|
@ -2265,7 +2265,8 @@ def proxy_bypass_environment(host):
|
|||
# strip port off host
|
||||
hostonly, port = splitport(host)
|
||||
# check if the host ends with any of the DNS suffixes
|
||||
for name in no_proxy.split(','):
|
||||
no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')]
|
||||
for name in no_proxy_list:
|
||||
if name and (hostonly.endswith(name) or host.endswith(name)):
|
||||
return 1
|
||||
# otherwise, don't bypass
|
||||
|
|
Loading…
Reference in New Issue