jenkins-bot submitted this change.

View Change

Revert "[IMPR] Simplify AddTextBot.skip_page"

This reverts commit 2d9d42d32abed1a80833aa48aa353ec750b18864.

Reason for revert: T285015

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

diff --git a/scripts/add_text.py b/scripts/add_text.py
index 242fde5..f565538 100755
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -63,11 +63,7 @@
 
 from pywikibot import config, i18n, pagegenerators, textlib
 from pywikibot.backports import Dict, Tuple
-from pywikibot.bot import (
-    AutomaticTWSummaryBot,
-    ExistingPageBot,
-    NoRedirectPageBot,
-)
+from pywikibot.bot import AutomaticTWSummaryBot, NoRedirectPageBot
 from pywikibot.bot_choice import QuitKeyboardInterrupt
 from pywikibot.exceptions import (
     EditConflictError,
@@ -337,13 +333,14 @@
 
     def skip_page(self, page):
         """Skip if -exceptUrl matches or page does not exists."""
-        if not page.isTalkPage() and ExistingPageBot.skip_page(self, page):
-            return True
-
-        if page.exists() and self.opt.regex_skip_url:
+        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:
             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 699863. To unsubscribe, or for help writing mail filters, visit settings.