jenkins-bot has submitted this change and it was merged.
Change subject: Bug 69455-pagegenerator filter grep can only be used once
......................................................................
Bug 69455-pagegenerator filter grep can only be used once
Multiple -grep:regxpr are now accepted by pagegenerator.
Change-Id: Ic0920511d44fbbc72212e397bf1888ab7cfa3901
---
M pywikibot/pagegenerators.py
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index aad6df1..ef80c98 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -181,6 +181,12 @@
-grep A regular expression that needs to match the article
otherwise the page won't be returned.
+ Multiple -grep:regexpr can be provided and the page will
+ be returned if content is matched by any of the regexpr
+ provided.
+ Case insensitive regular expressions will be used and
+ dot matches any character, including a newline.
+
"""
docuReplacements = {'¶ms;': parameterHelp}
@@ -206,7 +212,7 @@
self.namespaces = []
self.step = None
self.limit = None
- self.articlefilter = None
+ self.articlefilter_list = []
self.site = site
if self.site is None:
self.site = pywikibot.Site()
@@ -244,9 +250,9 @@
dupfiltergen = DuplicateFilterPageGenerator(gensList)
- if self.articlefilter:
+ if self.articlefilter_list:
return RegexBodyFilterPageGenerator(
- PreloadingGenerator(dupfiltergen), self.articlefilter)
+ PreloadingGenerator(dupfiltergen), self.articlefilter_list)
else:
return dupfiltergen
@@ -507,10 +513,10 @@
gen = RegexFilterPageGenerator(self.site.allpages(), regex)
elif arg.startswith('-grep'):
if len(arg) == 5:
- self.articlefilter = pywikibot.input(
- u'Which pattern do you want to grep?')
+ self.articlefilter_list.append(pywikibot.input(
+ u'Which pattern do you want to grep?'))
else:
- self.articlefilter = arg[6:]
+ self.articlefilter_list.append(arg[6:])
return True
elif arg.startswith('-yahoo'):
gen = YahooSearchPageGenerator(arg[7:])
--
To view, visit https://gerrit.wikimedia.org/r/153808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0920511d44fbbc72212e397bf1888ab7cfa3901
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <[email protected]>
Gerrit-Reviewer: Gallaecio <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
