diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-30 01:30:57 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-30 01:30:57 (GMT) |
| commit | 51b697b7f36e26c73136684f95e5d407fc2ed474 (patch) | |
| tree | 66264b55b1807c6710187934d7e6bba119510c1e /Lib/urllib | |
| parent | 0a5bd51dd30762e3e3b0f3b00ffe7899b9c58317 (diff) | |
| parent | aa27982ffca6ebfaad0a776e93e98a30e95b8b88 (diff) | |
| download | cpython-51b697b7f36e26c73136684f95e5d407fc2ed474.zip cpython-51b697b7f36e26c73136684f95e5d407fc2ed474.tar.gz cpython-51b697b7f36e26c73136684f95e5d407fc2ed474.tar.bz2 | |
Issue #26864: Merge no_proxy fixes from 3.5
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/request.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index e0a96e0..c519c2d 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2492,8 +2492,12 @@ def proxy_bypass_environment(host, proxies=None): # check if the host ends with any of the DNS suffixes 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 + if name: + name = re.escape(name) + pattern = r'(.+\.)?%s$' % name + if (re.match(pattern, hostonly, re.I) + or re.match(pattern, host, re.I)): + return 1 # otherwise, don't bypass return 0 |