X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/298230e550886b746c266724dd701d842ca2696e..d4b52ce3fcb8d9578ed12365648eaba8718c603e:/yt_dlp/webvtt.py diff --git a/yt_dlp/webvtt.py b/yt_dlp/webvtt.py index c80c58631..9f1a5086b 100644 --- a/yt_dlp/webvtt.py +++ b/yt_dlp/webvtt.py @@ -77,9 +77,8 @@ def commit(self): class ParseError(Exception): def __init__(self, parser): - super().__init__("Parse error at position %u (near %r)" % ( - parser._pos, parser._data[parser._pos:parser._pos + 20] - )) + data = parser._data[parser._pos:parser._pos + 100] + super().__init__(f'Parse error at position {parser._pos} (near {data!r})') # While the specification @@ -149,7 +148,7 @@ class Magic(HeaderBlock): # XXX: The X-TIMESTAMP-MAP extension is described in RFC 8216 §3.5 # , but the RFC - # doesn’t specify the exact grammar nor where in the WebVTT + # doesn't specify the exact grammar nor where in the WebVTT # syntax it should be placed; the below has been devised based # on usage in the wild # @@ -273,10 +272,10 @@ class CueBlock(Block): def parse(cls, parser): parser = parser.child() - id = None + id_ = None m = parser.consume(cls._REGEX_ID) if m: - id = m.group(1) + id_ = m.group(1) m0 = parser.consume(_REGEX_TS) if not m0: @@ -304,9 +303,9 @@ def parse(cls, parser): parser.commit() return cls( - id=id, + id=id_, start=start, end=end, settings=settings, - text=text.getvalue() + text=text.getvalue(), ) def write_into(self, stream): @@ -343,7 +342,7 @@ def from_json(cls, json): start=json['start'], end=json['end'], text=json['text'], - settings=json['settings'] + settings=json['settings'], ) def hinges(self, other):