jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/375833 )
Change subject: Only preload grepping generator if possible ......................................................................
Only preload grepping generator if possible
When nopreload is True, preloading should always be avoided. It isn't problem to move this filter after preloading since it always needs the pages to have content in order to decide.
Change-Id: I9e4c30756660542c481521f985245e5d32ad02f5 --- M pywikibot/pagegenerators.py 1 file changed, 5 insertions(+), 5 deletions(-)
Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 1216f84..b0c6dab 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -528,20 +528,20 @@ dupfiltergen = RegexFilterPageGenerator( dupfiltergen, self.titlenotfilter_list, 'none')
- if self.articlefilter_list: - dupfiltergen = RegexBodyFilterPageGenerator( - PreloadingGenerator(dupfiltergen), self.articlefilter_list) - if self.catfilter_list: dupfiltergen = CategoryFilterPageGenerator( dupfiltergen, self.catfilter_list, self.site)
- if preload and not self.nopreload: + if (preload or self.articlefilter_list) and not self.nopreload: if isinstance(dupfiltergen, DequeGenerator): dupfiltergen = DequePreloadingGenerator(dupfiltergen) else: dupfiltergen = PreloadingGenerator(dupfiltergen)
+ if self.articlefilter_list: + dupfiltergen = RegexBodyFilterPageGenerator( + dupfiltergen, self.articlefilter_list) + return dupfiltergen
@deprecated_args(arg='category')