Issue #29142: Merge 3.6.

This commit is contained in:
Xiang Zhang 2017-01-09 11:52:10 +08:00
commit 04c15d5bdc
3 changed files with 7 additions and 1 deletions

View file

@ -2513,6 +2513,7 @@ def proxy_bypass_environment(host, proxies=None):
no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')]
for name in no_proxy_list:
if name:
name = name.lstrip('.') # ignore leading dots
name = re.escape(name)
pattern = r'(.+\.)?%s$' % name
if (re.match(pattern, hostonly, re.I)