jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/639909 )
Change subject: [IMPR] deprecate site arg in CategoryFilterPageGenerator
......................................................................
[IMPR] deprecate site arg in CategoryFilterPageGenerator
Site arg can be obtained by the page itself.
Change-Id: I7923403be884bf87d3fbc9befde0c438e62b6c59
---
M pywikibot/pagegenerators.py
M tests/pagegenerators_tests.py
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 5b45c62..080fe3b 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -571,7 +571,7 @@
if self.catfilter_list:
dupfiltergen = CategoryFilterPageGenerator(
- dupfiltergen, self.catfilter_list, self.site)
+ dupfiltergen, self.catfilter_list)
if (preload or self.articlefilter_list) and not self.nopreload:
if isinstance(dupfiltergen, DequeGenerator):
@@ -1833,7 +1833,8 @@
yield page
-def CategoryFilterPageGenerator(generator, category_list, site=None):
+@deprecated_args(site=None, since='20201107')
+def CategoryFilterPageGenerator(generator, category_list):
"""
Wrap a generator to filter pages by categories specified.
@@ -1842,10 +1843,8 @@
@type category_list: list of category objects
"""
- if site is None:
- site = pywikibot.Site()
for page in generator:
- if all(x in site.pagecategories(page) for x in category_list):
+ if all(x in page.categories() for x in category_list):
yield page
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 7010ee2..3524234 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -236,7 +236,7 @@
site = self.site
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site)
gen = pagegenerators.CategoryFilterPageGenerator(
- gen, self.catfilter_list, site)
+ gen, self.catfilter_list)
self.assertLength(tuple(gen), 10)
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/639909
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I7923403be884bf87d3fbc9befde0c438e62b6c59
Gerrit-Change-Number: 639909
Gerrit-PatchSet: 2
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Hazard-SJ <hazardsjwiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged