From 1b2f9050fb274d1c4c1f3c6f2869f04f49b9e65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 19 Jul 2021 02:23:20 +0200 Subject: [PATCH] rename all instances of 'kwds' to 'kwdict' --- gallery_dl/job.py | 18 +++++++++--------- gallery_dl/util.py | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gallery_dl/job.py b/gallery_dl/job.py index c8b645f4..953d9c35 100644 --- a/gallery_dl/job.py +++ b/gallery_dl/job.py @@ -107,23 +107,23 @@ class Job(): def dispatch(self, msg): """Call the appropriate message handler""" if msg[0] == Message.Url: - _, url, kwds = msg + _, url, kwdict = msg if self.url_key: - kwds[self.url_key] = url - if self.pred_url(url, kwds): - self.update_kwdict(kwds) - self.handle_url(url, kwds) + kwdict[self.url_key] = url + if self.pred_url(url, kwdict): + self.update_kwdict(kwdict) + self.handle_url(url, kwdict) elif msg[0] == Message.Directory: self.update_kwdict(msg[1]) self.handle_directory(msg[1]) elif msg[0] == Message.Queue: - _, url, kwds = msg + _, url, kwdict = msg if self.url_key: - kwds[self.url_key] = url - if self.pred_queue(url, kwds): - self.handle_queue(url, kwds) + kwdict[self.url_key] = url + if self.pred_queue(url, kwdict): + self.handle_queue(url, kwdict) elif msg[0] == Message.Version: if msg[1] != 1: diff --git a/gallery_dl/util.py b/gallery_dl/util.py index f6827f9f..c86d5832 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -400,7 +400,7 @@ def compile_expression(expr, name="", globals=GLOBALS): def build_predicate(predicates): if not predicates: - return lambda url, kwds: True + return lambda url, kwdict: True elif len(predicates) == 1: return predicates[0] else: @@ -418,7 +418,7 @@ class RangePredicate(): else: self.lower, self.upper = 0, 0 - def __call__(self, url, kwds): + def __call__(self, url, _): self.index += 1 if self.index > self.upper: @@ -483,7 +483,7 @@ class UniquePredicate(): def __init__(self): self.urls = set() - def __call__(self, url, kwds): + def __call__(self, url, _): if url.startswith("text:"): return True if url not in self.urls: @@ -513,9 +513,9 @@ class ChainPredicate(): def __init__(self, predicates): self.predicates = predicates - def __call__(self, url, kwds): + def __call__(self, url, kwdict): for pred in self.predicates: - if not pred(url, kwds): + if not pred(url, kwdict): return False return True