jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/439447 ) Change subject: [IMPR] use ExistingPageBot and RedirectPageBot class for RedirectRobot ...................................................................... [IMPR] use ExistingPageBot and RedirectPageBot class for RedirectRobot - Skip ExistingPageBot and RedirectPageBot by standard behaviour - use treat_page instead of treat to highlight the page titles - remove unneeded code parts - fix skip warnings Change-Id: Idcecf54f0d8f82de475d330fd9ea12a5380df6b2 --- M pywikibot/bot.py M scripts/redirect.py 2 files changed, 17 insertions(+), 38 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 6b7f809..1557b9d 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1839,7 +1839,7 @@ """Treat only redirect pages and handle IsNotRedirectPage from it.""" if not page.isRedirectPage(): pywikibot.warning( - 'Page {page} on {page.site} is skipped because it is' + 'Page {page} on {page.site} is skipped because it is ' 'not a redirect'.format(page=page)) return True return super(RedirectPageBot, self).skip_page(page) @@ -1853,7 +1853,7 @@ """Treat only non-redirect pages and handle IsRedirectPage from it.""" if page.isRedirectPage(): pywikibot.warning( - 'Page {page} on {page.site} is skipped because it is' + 'Page {page} on {page.site} is skipped because it is ' 'a redirect'.format(page=page)) return True return super(NoRedirectPageBot, self).skip_page(page) diff --git a/scripts/redirect.py b/scripts/redirect.py index c2bcfdd..8928813 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -85,10 +85,10 @@ import pywikibot from pywikibot import i18n, xmlreader -from pywikibot.bot import OptionHandler, SingleSiteBot +from pywikibot.bot import (OptionHandler, SingleSiteBot, ExistingPageBot, + RedirectPageBot) from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import extract_templates_and_params_regex_simple -from pywikibot.tools.formatter import color_format from pywikibot.tools import issue_deprecation_warning if sys.version_info[0] > 2: @@ -400,7 +400,7 @@ continue -class RedirectRobot(SingleSiteBot): +class RedirectRobot(SingleSiteBot, ExistingPageBot, RedirectPageBot): """Redirect bot.""" @@ -490,19 +490,11 @@ def delete_1_broken_redirect(self, redir_page): """Treat one broken redirect.""" - # Show the title of the page we're working on. - # Highlight the title in purple. done = not self.getOption('delete') - pywikibot.output(color_format( - '\n\n>>> {lightpurple}{0}{default} <<<', redir_page.title())) try: targetPage = redir_page.getRedirectTarget() - except pywikibot.IsNotRedirectPage: - pywikibot.output(u'%s is not a redirect.' % redir_page.title()) except pywikibot.CircularRedirect: pywikibot.output('%s is a circular redirect.' % redir_page.title()) - except pywikibot.NoPage: - pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) except pywikibot.InvalidTitle: pywikibot.exception() except pywikibot.InterwikiRedirectPage: @@ -585,10 +577,6 @@ def fix_1_double_redirect(self, redir): """Treat one double redirect.""" - # Show the title of the page we're working on. - # Highlight the title in purple. - pywikibot.output(color_format( - '\n\n>>> {lightpurple}{0}{default} <<<', redir.title())) newRedir = redir redirList = [] # bookkeeping to detect loops while True: @@ -597,11 +585,7 @@ try: targetPage = newRedir.getRedirectTarget() except pywikibot.IsNotRedirectPage: - if len(redirList) == 1: - pywikibot.output(u'Skipping: Page %s is not a redirect.' - % redir.title(asLink=True)) - break # do nothing - elif len(redirList) == 2: + if len(redirList) == 2: pywikibot.output( u'Skipping: Redirect target %s is not a redirect.' % newRedir.title(asLink=True)) @@ -624,20 +608,15 @@ % str(e)[10:]) break except pywikibot.NoPage: - if len(redirList) == 1: - pywikibot.output(u'Skipping: Page %s does not exist.' - % redir.title(asLink=True)) - break + if self.getOption('always'): + pywikibot.output( + "Skipping: Redirect target {} doesn't exist." + .format(newRedir.title(asLink=True))) + break # skip if automatic else: - if self.getOption('always'): - pywikibot.output( - u"Skipping: Redirect target %s doesn't exist." - % newRedir.title(asLink=True)) - break # skip if automatic - else: - pywikibot.warning( - u"Redirect target %s doesn't exist." - % newRedir.title(asLink=True)) + pywikibot.warning( + "Redirect target {} doesn't exist." + .format(newRedir.title(asLink=True))) except pywikibot.ServerError: pywikibot.output(u'Skipping due to server error: ' u'No textarea found') @@ -728,13 +707,13 @@ else: self.fix_1_double_redirect(page) - def treat(self, page): - """Treat a single page.""" + def treat_page(self): + """Treat current page.""" if self._treat_counter >= self.getOption('total'): pywikibot.output('\nNumber of pages reached the total limit. ' 'Script terminated.') self.quit() - self.action_treat(page) + self.action_treat(self.current_page) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/439447 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idcecf54f0d8f82de475d330fd9ea12a5380df6b2 Gerrit-Change-Number: 439447 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Zoranzoki21 &lt;zorandori4444(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot