Skip to content

Commit d758141

Browse files
committed
Update request.py
1 parent 33f52f9 commit d758141

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

Lib/urllib/request.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,24 +2148,22 @@ def getproxy_bypass_registry():
21482148
return proxyOverride
21492149

21502150
def proxy_bypass_registry(host, proxyOverride=None):
2151-
if proxyOverride is None:
2152-
proxyOverride = getproxy_bypass_registry()
2153-
2154-
if proxyOverride:
2151+
if proxyOverride:= proxyOverride or getproxy_bypass_registry():
21552152
return _proxy_bypass_winreg_override(host, proxyOverride)
2153+
return False
21562154

2157-
def proxy_bypass(host):
2155+
def proxy_bypass(host, env_proxies=None, proxyOverride=None):
21582156
"""Return True, if host should be bypassed.
21592157
21602158
Checks proxy settings gathered from the environment, if specified,
21612159
or the registry.
21622160
21632161
"""
2164-
proxies = getproxies_environment()
2165-
if proxies:
2162+
if proxies:= env_proxies or getproxies_environment():
21662163
return proxy_bypass_environment(host, proxies)
21672164
else:
2168-
return proxy_bypass_registry(host)
2165+
proxyOverride = proxyOverride or getproxy_bypass_registry()
2166+
return proxy_bypass_registry(host, proxyOverride)
21692167

21702168
else:
21712169
# By default use environment variables

0 commit comments

Comments
 (0)