Skip to content

Commit 4612635

Browse files
committed
python: Prefer proxy_bypass over proxy_bypass_environment
1 parent 712b936 commit 4612635

File tree

4 files changed

+8
-8
lines changed
  • modules/openapi-generator/src/main/resources/python
  • samples
    • client/echo_api
      • python-disallowAdditionalPropertiesIfNotPresent/openapi_client
      • python/openapi_client
    • openapi3/client/petstore/python/petstore_api

4 files changed

+8
-8
lines changed

modules/openapi-generator/src/main/resources/python/rest.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import json
88
import re
99
import ssl
1010
from urllib.parse import urlparse
11-
from urllib.request import proxy_bypass_environment
11+
from urllib.request import proxy_bypass
1212

1313
import urllib3
1414

@@ -299,4 +299,4 @@ def should_bypass_proxies(url, no_proxy=None):
299299
for item in entries:
300300
if in_ipv4net(parsed.hostname, item):
301301
return True
302-
return proxy_bypass_environment(parsed.hostname, {'no': no_proxy} )
302+
return proxy_bypass(parsed.hostname, {'no': no_proxy} )

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/rest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import re
2020
import ssl
2121
from urllib.parse import urlparse
22-
from urllib.request import proxy_bypass_environment
22+
from urllib.request import proxy_bypass
2323

2424
import urllib3
2525

@@ -310,4 +310,4 @@ def should_bypass_proxies(url, no_proxy=None):
310310
for item in entries:
311311
if in_ipv4net(parsed.hostname, item):
312312
return True
313-
return proxy_bypass_environment(parsed.hostname, {'no': no_proxy} )
313+
return proxy_bypass(parsed.hostname, {'no': no_proxy} )

samples/client/echo_api/python/openapi_client/rest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import re
2020
import ssl
2121
from urllib.parse import urlparse
22-
from urllib.request import proxy_bypass_environment
22+
from urllib.request import proxy_bypass
2323

2424
import urllib3
2525

@@ -310,4 +310,4 @@ def should_bypass_proxies(url, no_proxy=None):
310310
for item in entries:
311311
if in_ipv4net(parsed.hostname, item):
312312
return True
313-
return proxy_bypass_environment(parsed.hostname, {'no': no_proxy} )
313+
return proxy_bypass(parsed.hostname, {'no': no_proxy} )

samples/openapi3/client/petstore/python/petstore_api/rest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import re
1919
import ssl
2020
from urllib.parse import urlparse
21-
from urllib.request import proxy_bypass_environment
21+
from urllib.request import proxy_bypass
2222

2323
import urllib3
2424

@@ -309,4 +309,4 @@ def should_bypass_proxies(url, no_proxy=None):
309309
for item in entries:
310310
if in_ipv4net(parsed.hostname, item):
311311
return True
312-
return proxy_bypass_environment(parsed.hostname, {'no': no_proxy} )
312+
return proxy_bypass(parsed.hostname, {'no': no_proxy} )

0 commit comments

Comments
 (0)