diff options
Diffstat (limited to 'yt_dlp')
| -rw-r--r-- | yt_dlp/YoutubeDL.py | 3 | ||||
| -rw-r--r-- | yt_dlp/compat/_legacy.py | 4 | ||||
| -rw-r--r-- | yt_dlp/networking/exceptions.py | 116 |
3 files changed, 3 insertions, 120 deletions
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 8d96498a6..5dcefb5b8 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -40,7 +40,6 @@ from .networking.exceptions import ( NoSupportingHandlers, RequestError, SSLError, - _CompatHTTPError, network_exceptions, ) from .plugins import directories as plugin_directories @@ -4110,8 +4109,6 @@ class YoutubeDL: 'SSLV3_ALERT_HANDSHAKE_FAILURE: The server may not support the current cipher list. ' 'Try using --legacy-server-connect', cause=e) from e raise - except HTTPError as e: # TODO: Remove in a future release - raise _CompatHTTPError(e) from e def build_request_director(self, handlers, preferences=None): logger = _YDLLogger(self) diff --git a/yt_dlp/compat/_legacy.py b/yt_dlp/compat/_legacy.py index 90ccf0f14..7ea5d0812 100644 --- a/yt_dlp/compat/_legacy.py +++ b/yt_dlp/compat/_legacy.py @@ -35,6 +35,7 @@ from .compat_utils import passthrough_module from ..dependencies import brotli as compat_brotli # noqa: F401 from ..dependencies import websockets as compat_websockets # noqa: F401 from ..dependencies.Cryptodome import AES as compat_pycrypto_AES # noqa: F401 +from ..networking.exceptions import HTTPError as compat_HTTPError # noqa: F401 passthrough_module(__name__, '...utils', ('WINDOWS_VT_MODE', 'windows_enable_vt_mode')) @@ -70,7 +71,6 @@ compat_html_parser_HTMLParseError = compat_HTMLParseError compat_HTMLParser = compat_html_parser_HTMLParser = html.parser.HTMLParser compat_http_client = http.client compat_http_server = http.server -compat_HTTPError = urllib.error.HTTPError compat_input = input compat_integer_types = (int, ) compat_itertools_count = itertools.count @@ -88,7 +88,7 @@ compat_struct_unpack = struct.unpack compat_subprocess_get_DEVNULL = lambda: subprocess.DEVNULL compat_tokenize_tokenize = tokenize.tokenize compat_urllib_error = urllib.error -compat_urllib_HTTPError = urllib.error.HTTPError +compat_urllib_HTTPError = compat_HTTPError compat_urllib_parse = urllib.parse compat_urllib_parse_parse_qs = urllib.parse.parse_qs compat_urllib_parse_quote = urllib.parse.quote diff --git a/yt_dlp/networking/exceptions.py b/yt_dlp/networking/exceptions.py index 12441901c..9037f18e2 100644 --- a/yt_dlp/networking/exceptions.py +++ b/yt_dlp/networking/exceptions.py @@ -1,9 +1,8 @@ from __future__ import annotations import typing -import urllib.error -from ..utils import YoutubeDLError, deprecation_warning +from ..utils import YoutubeDLError if typing.TYPE_CHECKING: from .common import RequestHandler, Response @@ -101,117 +100,4 @@ class ProxyError(TransportError): pass -class _CompatHTTPError(urllib.error.HTTPError, HTTPError): - """ - Provides backwards compatibility with urllib.error.HTTPError. - Do not use this class directly, use HTTPError instead. - """ - - def __init__(self, http_error: HTTPError): - super().__init__( - url=http_error.response.url, - code=http_error.status, - msg=http_error.msg, - hdrs=http_error.response.headers, - fp=http_error.response - ) - self._closer.close_called = True # Disable auto close - self._http_error = http_error - HTTPError.__init__(self, http_error.response, redirect_loop=http_error.redirect_loop) - - @property - def status(self): - return self._http_error.status - - @status.setter - def status(self, value): - return - - @property - def reason(self): - return self._http_error.reason - - @reason.setter - def reason(self, value): - return - - @property - def headers(self): - deprecation_warning('HTTPError.headers is deprecated, use HTTPError.response.headers instead') - return self._http_error.response.headers - - @headers.setter - def headers(self, value): - return - - def info(self): - deprecation_warning('HTTPError.info() is deprecated, use HTTPError.response.headers instead') - return self.response.headers - - def getcode(self): - deprecation_warning('HTTPError.getcode is deprecated, use HTTPError.status instead') - return self.status - - def geturl(self): - deprecation_warning('HTTPError.geturl is deprecated, use HTTPError.response.url instead') - return self.response.url - - @property - def code(self): - deprecation_warning('HTTPError.code is deprecated, use HTTPError.status instead') - return self.status - - @code.setter - def code(self, value): - return - - @property - def url(self): - deprecation_warning('HTTPError.url is deprecated, use HTTPError.response.url instead') - return self.response.url - - @url.setter - def url(self, value): - return - - @property - def hdrs(self): - deprecation_warning('HTTPError.hdrs is deprecated, use HTTPError.response.headers instead') - return self.response.headers - - @hdrs.setter - def hdrs(self, value): - return - - @property - def filename(self): - deprecation_warning('HTTPError.filename is deprecated, use HTTPError.response.url instead') - return self.response.url - - @filename.setter - def filename(self, value): - return - - def __getattr__(self, name): - # File operations are passed through the response. - # Warn for some commonly used ones - passthrough_warnings = { - 'read': 'response.read()', - # technically possibly due to passthrough, but we should discourage this - 'get_header': 'response.get_header()', - 'readable': 'response.readable()', - 'closed': 'response.closed', - 'tell': 'response.tell()', - } - if name in passthrough_warnings: - deprecation_warning(f'HTTPError.{name} is deprecated, use HTTPError.{passthrough_warnings[name]} instead') - return super().__getattr__(name) - - def __str__(self): - return str(self._http_error) - - def __repr__(self): - return repr(self._http_error) - - network_exceptions = (HTTPError, TransportError) |