jenkins-bot submitted this change.

View Change

Approvals: Damian: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified
[IMPR] Simplify AddTextBot.skip_page

Change-Id: I4272bb151c6fb341d3b031ef4b4ce15c27778c70
---
M scripts/add_text.py
1 file changed, 10 insertions(+), 7 deletions(-)

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. '

To view, visit change 699702. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I4272bb151c6fb341d3b031ef4b4ce15c27778c70
Gerrit-Change-Number: 699702
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: Damian <atagar1@gmail.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged