Skip to content

Commit

Permalink
[CI] auto update yt_dlp to upstream commit 4e38e2ae9d7380015349e6aee5…
Browse files Browse the repository at this point in the history
…9c78bb3938befd
  • Loading branch information
github-actions[bot] committed Oct 15, 2023
1 parent 6905d71 commit fefde20
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions lib/yt_dlp/networking/_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,17 @@ def read(self, amt: int = None):
except urllib3.exceptions.SSLError as e:
raise SSLError(cause=e) from e

except urllib3.exceptions.IncompleteRead as e:
# urllib3 IncompleteRead.partial is always an integer
raise IncompleteRead(partial=e.partial, expected=e.expected) from e

except urllib3.exceptions.ProtocolError as e:
# http.client.IncompleteRead may be contained within ProtocolError
# IncompleteRead is always contained within ProtocolError
# See urllib3.response.HTTPResponse._error_catcher()
ir_err = next(
(err for err in (e.__context__, e.__cause__, *variadic(e.args))
if isinstance(err, http.client.IncompleteRead)), None)
if ir_err is not None:
raise IncompleteRead(partial=len(ir_err.partial), expected=ir_err.expected) from e
# `urllib3.exceptions.IncompleteRead` is subclass of `http.client.IncompleteRead`
# but uses an `int` for its `partial` property.
partial = ir_err.partial if isinstance(ir_err.partial, int) else len(ir_err.partial)
raise IncompleteRead(partial=partial, expected=ir_err.expected) from e
raise TransportError(cause=e) from e

except urllib3.exceptions.HTTPError as e:
Expand Down
2 changes: 1 addition & 1 deletion lib/yt_dlp/networking/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __repr__(self):


class IncompleteRead(TransportError):
def __init__(self, partial: int, expected: int = None, **kwargs):
def __init__(self, partial: int, expected: int | None = None, **kwargs):
self.partial = partial
self.expected = expected
msg = f'{partial} bytes read'
Expand Down
2 changes: 1 addition & 1 deletion lib/yt_dlp_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8a8b54523addf46dfd50ef599761a81bc22362e6
4e38e2ae9d7380015349e6aee59c78bb3938befd

0 comments on commit fefde20

Please sign in to comment.