alihan/youtube-dl-fork-yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-09-17 08:36:59 +03:00
Code Issues Projects Releases Wiki Activity

[rh:requests] Bump minimum requests version to 2.32.2 (#10079)

Browse Source 
Closes #10078
Authored by: bashonly
This commit is contained in:
bashonly
2024-06-01 13:57:23 -05:00
committed by GitHub
parent 2e5a47da40
commit db50f19d76
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -262,7 +262,7 @@ You can also run `make yt-dlp` instead to compile only the binary without updati
### Standalone Py2Exe Builds (Windows) ### Standalone Py2Exe Builds (Windows)
While we provide the option to build with [py2exe](https://www.py2exe.org), it is recommended to build [using PyInstaller](#standalone-pyinstaller-builds) instead since the py2exe builds **cannot contain `pycryptodomex`/`certifi` and need VC++14** on the target computer to run. While we provide the option to build with [py2exe](https://www.py2exe.org), it is recommended to build [using PyInstaller](#standalone-pyinstaller-builds) instead since the py2exe builds **cannot contain `pycryptodomex`/`certifi`/`requests` and need VC++14** on the target computer to run.
If you wish to build it anyway, install Python (if it is not already installed) and you can run the following commands: If you wish to build it anyway, install Python (if it is not already installed) and you can run the following commands:

6
bundle/py2exe.py
View File

@@ -42,9 +42,9 @@ def main():
# py2exe cannot import Crypto # py2exe cannot import Crypto
'Crypto', 'Crypto',
'Cryptodome', 'Cryptodome',
# py2exe appears to confuse this with our socks library. # requests >=2.32.0 breaks py2exe builds due to certifi dependency
# We don't use pysocks and urllib3.contrib.socks would fail to import if tried. 'requests',
'urllib3.contrib.socks' 'urllib3'
], ],
'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'], 'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
# Modules that are only imported dynamically must be added here # Modules that are only imported dynamically must be added here

3
pyproject.toml
View File

@@ -46,7 +46,7 @@ dependencies = [
"certifi", "certifi",
"mutagen", "mutagen",
"pycryptodomex", "pycryptodomex",
"requests>=2.31.0,<3", "requests>=2.32.2,<3",
"urllib3>=1.26.17,<3", "urllib3>=1.26.17,<3",
"websockets>=12.0", "websockets>=12.0",
] ]
@@ -82,7 +82,6 @@ pyinstaller = [
] ]
py2exe = [ py2exe = [
"py2exe>=0.12", "py2exe>=0.12",
"requests==2.31.*",
] ]
[project.urls] [project.urls]

9
yt_dlp/networking/_requests.py
View File

@@ -21,8 +21,8 @@ urllib3_version = tuple(int_or_none(x, default=0) for x in urllib3.__version__.s
if urllib3_version < (1, 26, 17): if urllib3_version < (1, 26, 17):
raise ImportError('Only urllib3 >= 1.26.17 is supported') raise ImportError('Only urllib3 >= 1.26.17 is supported')
if requests.__build__ < 0x023100: if requests.__build__ < 0x023202:
raise ImportError('Only requests >= 2.31.0 is supported') raise ImportError('Only requests >= 2.32.2 is supported')
import requests.adapters import requests.adapters
import requests.utils import requests.utils
@@ -182,14 +182,9 @@ class RequestsHTTPAdapter(requests.adapters.HTTPAdapter):
return super().proxy_manager_for(proxy, **proxy_kwargs, **self._pm_args, **extra_kwargs) return super().proxy_manager_for(proxy, **proxy_kwargs, **self._pm_args, **extra_kwargs)
# Skip `requests` internal verification; we use our own SSLContext # Skip `requests` internal verification; we use our own SSLContext
# requests 2.31.0+
def cert_verify(*args, **kwargs): def cert_verify(*args, **kwargs):
pass pass
# requests 2.31.0-2.32.1
def _get_connection(self, request, *_, proxies=None, **__):
return self.get_connection(request.url, proxies)
# requests 2.32.2+: Reimplementation without `_urllib3_request_context` # requests 2.32.2+: Reimplementation without `_urllib3_request_context`
def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None): def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
url = urllib3.util.parse_url(request.url).url url = urllib3.util.parse_url(request.url).url