-
-
Notifications
You must be signed in to change notification settings - Fork 7.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[core] Workaround erroneous urllib Windows proxy parsing (#7092)
Convert proxies extracted from windows registry to http for older Python versions. See: python/cpython#86793 Authored by: coletdjnz
- Loading branch information
Showing
4 changed files
with
49 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# flake8: noqa: F405 | ||
from urllib import * # noqa: F403 | ||
|
||
from ..compat_utils import passthrough_module | ||
|
||
passthrough_module(__name__, 'urllib') | ||
del passthrough_module |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# flake8: noqa: F405 | ||
from urllib.request import * # noqa: F403 | ||
|
||
from ..compat_utils import passthrough_module | ||
|
||
passthrough_module(__name__, 'urllib.request') | ||
del passthrough_module | ||
|
||
|
||
from .. import compat_os_name | ||
|
||
if compat_os_name == 'nt': | ||
# On older python versions, proxies are extracted from Windows registry erroneously. [1] | ||
# If the https proxy in the registry does not have a scheme, urllib will incorrectly add https:// to it. [2] | ||
# It is unlikely that the user has actually set it to be https, so we should be fine to safely downgrade | ||
# it to http on these older python versions to avoid issues | ||
# This also applies for ftp proxy type, as ftp:// proxy scheme is not supported. | ||
# 1: https://github.com/python/cpython/issues/86793 | ||
# 2: https://github.com/python/cpython/blob/51f1ae5ceb0673316c4e4b0175384e892e33cc6e/Lib/urllib/request.py#L2683-L2698 | ||
import sys | ||
from urllib.request import getproxies_environment, getproxies_registry | ||
|
||
def getproxies_registry_patched(): | ||
proxies = getproxies_registry() | ||
if ( | ||
sys.version_info >= (3, 10, 5) # https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-5-final | ||
or (3, 9, 13) <= sys.version_info < (3, 10) # https://docs.python.org/3.9/whatsnew/changelog.html#python-3-9-13-final | ||
): | ||
return proxies | ||
|
||
for scheme in ('https', 'ftp'): | ||
if scheme in proxies and proxies[scheme].startswith(f'{scheme}://'): | ||
proxies[scheme] = 'http' + proxies[scheme][len(scheme):] | ||
|
||
return proxies | ||
|
||
def getproxies(): | ||
return getproxies_environment() or getproxies_registry_patched() | ||
|
||
del compat_os_name |