jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699702 )
Change subject: [IMPR] Simplify AddTextBot.skip_page ......................................................................
[IMPR] Simplify AddTextBot.skip_page
Change-Id: I4272bb151c6fb341d3b031ef4b4ce15c27778c70 --- M scripts/add_text.py 1 file changed, 10 insertions(+), 7 deletions(-)
Approvals: Damian: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/add_text.py b/scripts/add_text.py index f565538..242fde5 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -63,7 +63,11 @@
from pywikibot import config, i18n, pagegenerators, textlib from pywikibot.backports import Dict, Tuple -from pywikibot.bot import AutomaticTWSummaryBot, NoRedirectPageBot +from pywikibot.bot import ( + AutomaticTWSummaryBot, + ExistingPageBot, + NoRedirectPageBot, +) from pywikibot.bot_choice import QuitKeyboardInterrupt from pywikibot.exceptions import ( EditConflictError, @@ -333,14 +337,13 @@
def skip_page(self, page): """Skip if -exceptUrl matches or page does not exists.""" - if not page.exists(): - if not page.isTalkPage(): - pywikibot.warning('Page {page} does not exist on {page.site}.' - .format(page=page)) - return True - elif self.opt.regex_skip_url: + if not page.isTalkPage() and ExistingPageBot.skip_page(self, page): + return True + + if page.exists() and self.opt.regex_skip_url: url = page.full_url() result = re.findall(self.opt.regex_skip_url, page.site.getUrl(url)) + if result: pywikibot.warning( 'Regex (or word) used with -exceptUrl is in the page. '
pywikibot-commits@lists.wikimedia.org