summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-08-06 04:27:40 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-08-06 04:27:40 (GMT)
commit89976f1cdc49c909f808f8bb1ec15ac963acbc93 (patch)
tree54aa2cfad37964a43a6b2733cc224cc8131f477f
parente5cad23a92c88440e739589430c0b22d41a44621 (diff)
downloadcpython-89976f1cdc49c909f808f8bb1ec15ac963acbc93.zip
cpython-89976f1cdc49c909f808f8bb1ec15ac963acbc93.tar.gz
cpython-89976f1cdc49c909f808f8bb1ec15ac963acbc93.tar.bz2
Fix closes issue12698 - make the no_proxy environment variable handling a bit lenient (accomodate spaces in between the items)
-rw-r--r--Lib/test/test_urllib.py4
-rw-r--r--Lib/urllib/request.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 3a806bf..ac02374 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -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."""
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 1dda966..773025a 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -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