From 74e39ca0fd91ec3d55140cab292eb9ef98e9f3d5 Mon Sep 17 00:00:00 2001 From: dirkf Date: Sun, 16 Apr 2023 21:24:09 +0100 Subject: [PATCH] [utils] Allow kwargs for `parse_qs()` * supported by `compat_parse_qs()`: keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replac> * now equivalent to yt-dlp --- youtube_dl/utils.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index d80ceb007..716fd36b9 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -2388,7 +2388,7 @@ class YoutubeDLError(Exception): class ExtractorError(YoutubeDLError): """Error during info extraction.""" - def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None): + def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None, ie=None): """ tb, if given, is the original traceback (so that it can be printed out). If expected is set, this is a normal error message and most likely not a bug in youtube-dl. """ @@ -2407,6 +2407,7 @@ class ExtractorError(YoutubeDLError): self.exc_info = sys.exc_info() # preserve original exception self.cause = cause self.video_id = video_id + self.ie = ie def format_traceback(self): if self.traceback is None: @@ -4096,8 +4097,8 @@ def escape_url(url): ).geturl() -def parse_qs(url): - return compat_parse_qs(compat_urllib_parse.urlparse(url).query) +def parse_qs(url, **kwargs): + return compat_parse_qs(compat_urllib_parse.urlparse(url).query, **kwargs) def read_batch_urls(batch_fd): @@ -6191,3 +6192,24 @@ def join_nonempty(*values, **kwargs): if from_dict is not None: values = (traverse_obj(from_dict, variadic(v)) for v in values) return delim.join(map(compat_str, filter(None, values))) + + +class classproperty(object): + """property access for class methods with optional caching""" + def __new__(cls, *args, **kwargs): + func = args[0] if len(args) > 0 else kwargs.get('func') + if not func: + return functools.partial(cls, *args, **kwargs) + return super(classproperty, cls).__new__(cls) + + def __init__(self, func, cache=False): + functools.update_wrapper(self, func) + self.func = func + self._cache = {} if cache else None + + def __get__(self, _, cls): + if self._cache is None: + return self.func(cls) + elif cls not in self._cache: + self._cache[cls] = self.func(cls) + return self._cache[cls]