jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979900?usp=email )
Change subject: [IMPR] improvements for CategoryRedirectBot
......................................................................
[IMPR] improvements for CategoryRedirectBot
- derive CategoryRedirectBot from AutomaticTWSummaryBot
- L10N detection during CategoryRedirectBot.__init__
- move loading record data into load_record() method
- enable edit_requests log if moving categories fails
- use check_hard_redirect as treat method
- move code from run() method to check_soft_redirect
and use it as treat method
- add touch method for null edits
- add methods to setup hard and soft redirects treats
- change run method to only prepare BaseBot.run for different treats
- only save log if necessary
Bug: T276345
Bug: T351951
Bug: T352970
Change-Id: I27445dfe11f47f5867a64a20a528c28d79dfb0dc
---
M scripts/category_redirect.py
1 file changed, 369 insertions(+), 241 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index c8f1977..897bedd 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -1,13 +1,15 @@
#!/usr/bin/env python3
"""This bot will move pages out of redirected categories.
-The bot will look for categories that are marked with a category redirect
-template, take the first parameter of the template as the target of the
-redirect, and move all pages and subcategories of the category there. It
-also changes hard redirects into soft redirects, and fixes double redirects.
-A log is written under <userpage>/category_redirect_log. Only category pages
-that haven't been edited for a certain cooldown period (currently 7 days)
-are taken into account.
+The bot will look for categories that are marked with a category
+redirect template, take the first parameter of the template as the
+target of the redirect, and move all pages and subcategories of the
+category there. It also changes hard redirects into soft redirects, and
+fixes double redirects. A log is written under
+``<userpage>/category_redirect_log``. A log is written under
+``<userpage>/category_edit_requests`` if a page cannot be moved to be
+done manually. Only category pages that haven't been edited for a
+certain cooldown period (default 7 days) are taken into account.
The following parameters are supported:
@@ -45,8 +47,15 @@
import pywikibot
from pywikibot import config, i18n, pagegenerators
from pywikibot.backports import removeprefix
-from pywikibot.bot import ConfigParserBot, SingleSiteBot
-from pywikibot.exceptions import CircularRedirectError, Error, NoPageError
+from pywikibot.bot import AutomaticTWSummaryBot, ConfigParserBot, SingleSiteBot
+from pywikibot.exceptions import (
+ CircularRedirectError,
+ Error,
+ LockedPageError,
+ NoCreateError,
+ NoPageError,
+ PageSaveRelatedError,
+)
LOG_SIZE = 7 # Number of items to keep in active log
@@ -54,14 +63,26 @@
CAT_REDIRECT_CAT = 'Q4616723'
# Category that contains non-empty redirected category pages
TINY_CAT_REDIRECT_CAT = 'Q8099903'
+MOVE_COMMENT = 'category_redirect-change-category'
+REDIR_COMMENT = 'category_redirect-add-template'
+DBL_REDIR_COMMENT = 'category_redirect-fix-double'
+MAINT_COMMENT = 'category_redirect-comment'
-class CategoryRedirectBot(ConfigParserBot, SingleSiteBot):
+class CategoryRedirectBot(
+ ConfigParserBot,
+ SingleSiteBot,
+ AutomaticTWSummaryBot
+):
"""Page category update bot.
.. versionchanged:: 7.0
CategoryRedirectBot is a ConfigParserBot
+
+ .. versionchanged:: 9.0
+ A logentry is writen to <userpage>/category_edit_requests if a
+ page cannot be moved
"""
update_options = {
@@ -76,25 +97,30 @@
self.log_text = []
self.edit_requests = []
self.problems = []
- self.template_list = []
- self.cat = None
- self.log_page = pywikibot.Page(self.site,
- 'User:{}/category redirect log'
- .format(self.site.username()))
- self.move_comment = 'category_redirect-change-category'
- self.redir_comment = 'category_redirect-add-template'
- self.dbl_redir_comment = 'category_redirect-fix-double'
- self.maint_comment = 'category_redirect-comment'
+ self.record = {}
+ self.newredirs = []
+ self.oldstart = None
+
+ self.log_page = pywikibot.Page(
+ self.site, f'User:{self.site.username()}/category redirect log')
+
self.edit_request_text = i18n.twtranslate(
self.site, 'category_redirect-edit-request') + '\n~~~~'
self.edit_request_item = i18n.twtranslate(
self.site, 'category_redirect-edit-request-item')
+ # validate L10N
+ self.cat = self.get_cat()
+ if not self.cat:
+ raise Error(f'No redirect category found for {self.site}')
+ self.template_list = self.site.category_redirects()
+ if not self.template_list:
+ raise Error(f'No redirect templates defined for {self.site}')
+
def get_cat(self):
"""Specify the category page."""
item = TINY_CAT_REDIRECT_CAT if self.opt.tiny else CAT_REDIRECT_CAT
- self.cat = self.site.page_from_repository(item)
- return self.cat is not None
+ return self.site.page_from_repository(item)
def move_contents(self, old_cat_title: str, new_cat_title: str,
edit_summary: str) -> tuple[int, int]:
@@ -112,9 +138,16 @@
# Move articles
found, moved = 0, 0
- for article in old_cat.members():
- found += 1
- moved += article.change_category(old_cat, new_cat, summary=summary)
+ for found, article in enumerate(old_cat.members(), start=1):
+ done = article.change_category(old_cat, new_cat, summary=summary)
+ if done:
+ moved += 1
+ else:
+ self.edit_requests.append({
+ 'title': article.title(asLink=True, textlink=True),
+ 'oldcat': old_cat.title(asLink=True, textlink=True),
+ 'newcat': new_cat.title(asLink=True, textlink=True)}
+ )
if article.namespace() != 10:
continue
@@ -125,13 +158,22 @@
try:
doc.get()
except Error:
- pass
+ continue
+
+ done = doc.change_category(old_cat, new_cat, summary=summary)
+ if done:
+ moved += 1
else:
- moved += doc.change_category(old_cat, new_cat,
- summary=summary)
+ self.edit_requests.append({
+ 'title': doc.title(asLink=True, textlink=True),
+ 'oldcat': old_cat.title(asLink=True, textlink=True),
+ 'newcat': new_cat.title(asLink=True, textlink=True)}
+ )
if found:
+ self.counter['move'] += moved
pywikibot.info(f'{old_cat}: {found} found, {moved} moved')
+
return found, moved
def ready_to_edit(self, cat):
@@ -146,16 +188,20 @@
log_text = self.log_page.get()
except NoPageError:
log_text = ''
+
log_items = {}
header = None
+
for line in log_text.splitlines():
if line.startswith('==') and line.endswith('=='):
header = line[2:-2].strip()
if header is not None:
log_items.setdefault(header, [])
log_items[header].append(line)
+
if len(log_items) < LOG_SIZE:
return log_text
+
# sort by keys and keep the first (LOG_SIZE-1) values
keep = [text for (key, text) in
sorted(log_items.items(), reverse=True)[:LOG_SIZE - 1]]
@@ -172,96 +218,105 @@
log_text += ('\n\n' + message)
return log_text
+ def setup_hard_redirect(self):
+ """Setup hard redirect task."""
+ pywikibot.info('Checking hard-redirect category pages.')
+ self.summary_key = REDIR_COMMENT
+ self.generator = self.site.allpages(
+ namespace=14, filterredir=True, content=True)
+ self.treat_page = self.check_hard_redirect
+
def check_hard_redirect(self) -> None:
- """
- Check for hard-redirected categories.
+ """Check for hard-redirected categories.
Check categories that are not already marked with an appropriate
- softredirect template.
+ softredirect template and replace the content with a redirect
+ template.
"""
- pywikibot.info('Checking hard-redirect category pages.')
- comment = i18n.twtranslate(self.site, self.redir_comment)
-
- # generator yields all hard redirect pages in namespace 14
- for page in self.site.allpages(namespace=14, filterredir=True,
- content=True):
- if page.isCategoryRedirect():
- # this is already a soft-redirect, so skip it (for now)
- continue
- try:
- target = page.getRedirectTarget()
- except CircularRedirectError:
- target = page
- message = i18n.twtranslate(
- self.site, 'category_redirect-problem-self-linked',
- {'oldcat': page.title(as_link=True, textlink=True)})
- self.problems.append(message)
- except RuntimeError:
- # race condition: someone else removed the redirect while we
- # were checking for it
- continue
-
- if not target.is_categorypage():
- message = i18n.twtranslate(
- self.site, 'category_redirect-problem-hard', {
- 'oldcat': page.title(as_link=True, textlink=True),
- 'page': target.title(as_link=True, textlink=True)
- })
- self.problems.append(message)
- continue
-
- # this is a hard-redirect to a category page
- newtext = ('{{%(template)s|%(cat)s}}'
- % {'cat': target.title(with_ns=False),
- 'template': self.template_list[0]})
- params = {
- 'ns': self.site.namespaces.TEMPLATE.custom_prefix(),
- 'template': self.template_list[0],
- 'oldcat': page.title(as_link=True, textlink=True)
- }
- try:
- page.text = newtext
- page.save(comment)
- message = i18n.twtranslate(
- self.site, 'category_redirect-log-added', params)
- self.log_text.append(message)
- except Error as e:
- pywikibot.error(e)
- message = i18n.twtranslate(
- self.site, 'category_redirect-log-add-failed', params)
- self.log_text.append(message)
-
- def run(self) -> None:
- """Run the bot."""
- # validate L10N
- self.template_list = self.site.category_redirects()
- if not self.template_list:
- pywikibot.warning(f'No redirect templates defined for {self.site}')
- return
- if not self.get_cat():
- pywikibot.warning(f'No redirect category found for {self.site}')
+ page = self.current_page
+ if page.isCategoryRedirect():
+ # this is already a soft-redirect, so skip it (for now)
return
- self.user = self.site.user() # invokes login()
- self.newredirs = []
+ try:
+ target = page.getRedirectTarget()
+ except CircularRedirectError:
+ target = page
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-problem-self-linked',
+ {'oldcat': page.title(as_link=True, textlink=True)})
+ self.problems.append(message)
+ except RuntimeError:
+ # race condition: someone else removed the redirect while we
+ # were checking for it
+ return
- localtime = time.localtime()
- today = '{:04d}-{:02d}-{:02d}'.format(*localtime[:3])
+ if not target.is_categorypage():
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-problem-hard', {
+ 'oldcat': page.title(as_link=True, textlink=True),
+ 'page': target.title(as_link=True, textlink=True)
+ })
+ self.problems.append(message)
+ return
+
+ # this is a hard-redirect to a category page
+ newtext = ('{{%(template)s|%(cat)s}}'
+ % {'cat': target.title(with_ns=False),
+ 'template': self.template_list[0]})
+ params = {
+ 'ns': self.site.namespaces.TEMPLATE.custom_prefix(),
+ 'template': self.template_list[0],
+ 'oldcat': page.title(as_link=True, textlink=True)
+ }
+
+ try:
+ self.put_current(newtext)
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-log-added', params)
+ except Error as e:
+ pywikibot.error(e)
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-log-add-failed', params)
+
+ self.log_text.append(message)
+
+ def load_record(self) -> None:
+ """Load record from data file and create a backup file."""
self.datafile = pywikibot.config.datafilepath(
f'{self.site.dbName()}-catmovebot-data')
- try:
- with open(self.datafile, 'rb') as inp:
- self.record = pickle.load(inp)
- except OSError:
- self.record = {}
+ with suppress(OSError), open(self.datafile, 'rb') as inp:
+ self.record = pickle.load(inp)
if self.record:
with open(self.datafile + '.bak', 'wb') as f:
pickle.dump(self.record, f, protocol=config.pickle_protocol)
+
+ def touch(self, page) -> None:
+ """Touch the given page."""
+ try:
+ page.touch()
+ except (NoCreateError, NoPageError):
+ pywikibot.error(f'Page {page.title(as_link=True)} does not exist.')
+ except LockedPageError:
+ pywikibot.error(f'Page {page.title(as_link=True)} is locked.')
+ except PageSaveRelatedError as e:
+ pywikibot.error(f'Page {page} not saved:\n{e.args}')
+ else:
+ self.counter['touch'] += 1
+
+ def setup_soft_redirect(self):
+ """Setup soft redirect task."""
+ pywikibot.info(f'\nChecking {self.cat.categoryinfo["subcats"]}'
+ ' category redirect pages')
+ self.load_record()
+ localtime = time.localtime()
+ self.today = '{:04d}-{:02d}-{:02d}'.format(*localtime[:3])
+
# regex to match soft category redirects
# TODO: enhance and use textlib.MultiTemplateMatchBuilder
# note that any templates containing optional "category:" are
# incorrect and will be fixed by the bot
- template_regex = re.compile(
+ self.template_regex = re.compile(
r"""{{{{\s*(?:{prefix}\s*:\s*)? # optional "template:"
(?:{template})\s*\| # catredir template name
(\s*{catns}\s*:\s*)? # optional "category:"
@@ -273,42 +328,55 @@
catns=self.site.namespace(14)),
re.I | re.X)
- self.check_hard_redirect()
-
- comment = i18n.twtranslate(self.site, self.move_comment)
- counts = {}
nonemptypages = []
- redircat = self.cat
-
- pywikibot.info('\nChecking {} category redirect pages'
- .format(redircat.categoryinfo['subcats']))
catpages = set()
- for cat in redircat.subcategories():
- catpages.add(cat)
- cat_title = cat.title(with_ns=False)
- if 'category redirect' in cat_title:
- message = i18n.twtranslate(
- self.site, 'category_redirect-log-ignoring',
- {'oldcat': cat.title(as_link=True, textlink=True)})
- self.log_text.append(message)
- continue
- if hasattr(cat, '_catinfo'):
- # skip empty categories that don't return a "categoryinfo" key
- catdata = cat.categoryinfo
- if 'size' in catdata and int(catdata['size']):
- # save those categories that have contents
- nonemptypages.append(cat)
- if cat_title not in self.record:
- # make sure every redirect has a self.record entry
- self.record[cat_title] = {today: None}
- with suppress(Error):
- self.newredirs.append('*# {} → {}'.format(
- cat.title(as_link=True, textlink=True),
- cat.getCategoryRedirectTarget().title(
- as_link=True, textlink=True)))
- # do a null edit on cat
- with suppress(Exception):
- cat.save()
+
+ # No throttle for touch edits
+ save_throttle = config.put_throttle
+ config.put_throttle = 0
+
+ do_exit = False
+ try:
+ for cat in self.cat.subcategories():
+ if do_exit:
+ break
+
+ self.counter['read'] += 1
+ cat_title = cat.title(with_ns=False)
+ if 'category redirect' in cat_title:
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-log-ignoring',
+ {'oldcat': cat.title(as_link=True, textlink=True)})
+ self.log_text.append(message)
+ continue
+
+ if hasattr(cat, '_catinfo'):
+ # skip empty categories that don't return a "categoryinfo"
+ # key
+ catdata = cat.categoryinfo
+ if 'size' in catdata and int(catdata['size']):
+ # save those categories that have contents
+ nonemptypages.append(cat)
+
+ if cat_title not in self.record:
+ # make sure every redirect has a self.record entry
+ self.record[cat_title] = {self.today: None}
+ with suppress(Error):
+ self.newredirs.append('*# {} → {}'.format(
+ cat.title(as_link=True, textlink=True),
+ cat.getCategoryRedirectTarget().title(
+ as_link=True, textlink=True)))
+
+ # do a null edit on cat
+ if cat not in catpages:
+ self.touch(cat)
+
+ catpages.add(cat)
+ except KeyboardInterrupt:
+ pywikibot.info('KeyboardInterrupt during subcategory checks...')
+ do_exit = True
+
+ config.put_throttle = save_throttle
# delete self.record entries for non-existent categories
for cat_name in list(self.record):
@@ -316,126 +384,158 @@
self.catprefix + cat_name) not in catpages:
del self.record[cat_name]
- pywikibot.info('\nMoving pages out of {} redirected categories.'
- .format(len(nonemptypages)))
+ pywikibot.info(f'\nMoving pages out of {len(nonemptypages)}'
+ ' redirected categories.')
+ self.summary_key = DBL_REDIR_COMMENT
+ self.generator = pagegenerators.PreloadingGenerator(nonemptypages)
+ self.treat_page = self.check_soft_redirect
- for cat in pagegenerators.PreloadingGenerator(nonemptypages):
- i18n_param = {'oldcat': cat.title(as_link=True, textlink=True)}
+ def check_soft_redirect(self) -> None:
+ """Check for soft-redirected categories."""
+ cat = self.current_page
+ i18n_param = {'oldcat': cat.title(as_link=True, textlink=True)}
- try:
- if not cat.isCategoryRedirect():
- message = i18n.twtranslate(
- self.site,
- 'category_redirect-log-false-positive',
- i18n_param
- )
- self.log_text.append(message)
- continue
- except Error:
+ try:
+ if not cat.isCategoryRedirect():
+ message = i18n.twtranslate(
+ self.site,
+ 'category_redirect-log-false-positive',
+ i18n_param
+ )
+ self.log_text.append(message)
+ return
+ except Error:
+ message = i18n.twtranslate(self.site,
+ 'category_redirect-log-not-loaded',
+ i18n_param)
+ self.log_text.append(message)
+ return
+
+ cat_title = cat.title(with_ns=False)
+ if not self.ready_to_edit(cat):
+ message = i18n.twtranslate(self.site,
+ 'category_redirect-log-skipping',
+ i18n_param)
+ self.log_text.append(message)
+ return
+
+ dest = cat.getCategoryRedirectTarget()
+ if not dest.exists():
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-problem-redirects', {
+ 'oldcat': cat.title(as_link=True, textlink=True),
+ 'redpage': dest.title(as_link=True, textlink=True)
+ })
+ self.problems.append(message)
+ # do a null edit on cat to update any special redirect
+ # categories this wiki might maintain
+ self.touch(cat)
+ return
+
+ if dest.isCategoryRedirect():
+ double = dest.getCategoryRedirectTarget()
+ if double in (dest, cat):
message = i18n.twtranslate(self.site,
- 'category_redirect-log-not-loaded',
+ 'category_redirect-log-loop',
i18n_param)
self.log_text.append(message)
- continue
-
- cat_title = cat.title(with_ns=False)
- if not self.ready_to_edit(cat):
- counts[cat_title] = None
- message = i18n.twtranslate(self.site,
- 'category_redirect-log-skipping',
- i18n_param)
- self.log_text.append(message)
- continue
-
- dest = cat.getCategoryRedirectTarget()
- if not dest.exists():
+ # do a null edit on cat
+ self.touch(cat)
+ else:
message = i18n.twtranslate(
- self.site, 'category_redirect-problem-redirects', {
+ self.site, 'category_redirect-log-double', {
'oldcat': cat.title(as_link=True, textlink=True),
- 'redpage': dest.title(as_link=True, textlink=True)
+ 'newcat': dest.title(as_link=True, textlink=True),
+ 'targetcat': double.title(
+ as_link=True, textlink=True)
})
- self.problems.append(message)
- # do a null edit on cat to update any special redirect
- # categories this wiki might maintain
- with suppress(Exception):
- cat.save()
- continue
-
- if dest.isCategoryRedirect():
- double = dest.getCategoryRedirectTarget()
- if double in (dest, cat):
- message = i18n.twtranslate(self.site,
- 'category_redirect-log-loop',
- i18n_param)
- self.log_text.append(message)
- # do a null edit on cat
- with suppress(Exception):
- cat.save()
- else:
+ self.log_text.append(message)
+ oldtext = cat.text
+ # remove the old redirect from the old text,
+ # leaving behind any non-redirect text
+ oldtext = self.template_regex.sub('', oldtext)
+ newtext = ('{{%(redirtemp)s|%(ncat)s}}'
+ % {'redirtemp': self.template_list[0],
+ 'ncat': double.title(with_ns=False)})
+ newtext += oldtext.strip()
+ try:
+ self.put_current(newtext)
+ except Error as e:
message = i18n.twtranslate(
- self.site, 'category_redirect-log-double', {
- 'oldcat': cat.title(as_link=True, textlink=True),
- 'newcat': dest.title(as_link=True, textlink=True),
- 'targetcat': double.title(
- as_link=True, textlink=True)
- })
+ self.site, 'category_redirect-log-failed',
+ {'error': e})
self.log_text.append(message)
- oldtext = cat.text
- # remove the old redirect from the old text,
- # leaving behind any non-redirect text
- oldtext = template_regex.sub('', oldtext)
- newtext = ('{{%(redirtemp)s|%(ncat)s}}'
- % {'redirtemp': self.template_list[0],
- 'ncat': double.title(with_ns=False)})
- newtext += oldtext.strip()
- try:
- cat.text = newtext
- cat.save(i18n.twtranslate(self.site,
- self.dbl_redir_comment))
- except Error as e:
- message = i18n.twtranslate(
- self.site, 'category_redirect-log-failed',
- {'error': e})
- self.log_text.append(message)
- continue
+ return
- found, moved = self.move_contents(
- cat_title, dest.title(with_ns=False), comment)
- if found:
- self.record[cat_title][today] = found
- message = i18n.twtranslate(
- self.site, 'category_redirect-log-moved', {
- 'oldcat': cat.title(as_link=True, textlink=True),
- 'found': found,
- 'moved': moved
- })
- self.log_text.append(message)
- counts[cat_title] = found
- # do a null edit on cat
- with suppress(Exception):
- cat.save()
+ found, moved = self.move_contents(
+ cat_title,
+ dest.title(with_ns=False),
+ i18n.twtranslate(self.site, MOVE_COMMENT)
+ )
- self.teardown()
+ if found:
+ self.record[cat_title][self.today] = found
+ message = i18n.twtranslate(
+ self.site, 'category_redirect-log-moved', {
+ 'oldcat': cat.title(as_link=True, textlink=True),
+ 'found': found,
+ 'moved': moved
+ })
+ self.log_text.append(message)
+
+ # do a null edit on cat
+ self.touch(cat)
+
+ def run(self) -> None:
+ """Run the bot."""
+ self.user = self.site.user() # invokes login()
+
+ # process hard category redirects
+ oldexit = self.exit
+ self.exit = lambda: None
+ self.setup = self.setup_hard_redirect
+ super().run()
+
+ # save timestamp and prepare the next step
+ self.oldstart = self._start_ts
+ if not self.generator_completed \
+ and (self.opt.always
+ or not pywikibot.input_yn(
+ 'Continue with soft category redirects',
+ automatic_quit=False)):
+ oldexit()
+ return
+
+ # process soft category redirects
+ self.exit = oldexit
+ self.generator_completed = False
+ self.setup = self.setup_soft_redirect
+ super().run()
def teardown(self) -> None:
"""Write self.record to file and save logs."""
- with open(self.datafile, 'wb') as f:
- pickle.dump(self.record, f, protocol=config.pickle_protocol)
+ self._start_ts = self.oldstart
+ if self.record:
+ with open(self.datafile, 'wb') as f:
+ pickle.dump(self.record, f, protocol=config.pickle_protocol)
- self.log_text.sort()
- self.problems.sort()
- self.newredirs.sort()
- comment = i18n.twtranslate(self.site, self.maint_comment)
- message = i18n.twtranslate(self.site, 'category_redirect-log-new')
- date_line = '\n== {}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}Z ==\n' \
- .format(*time.gmtime()[:6])
- self.log_page.text = (date_line
- + '\n'.join(self.log_text)
- + '\n* ' + message + '\n'
- + '\n'.join(self.newredirs)
- + '\n' + '\n'.join(self.problems)
- + '\n' + self.get_log_text())
- self.log_page.save(comment)
+ comment = i18n.twtranslate(self.site, MAINT_COMMENT)
+
+ if self.log_text or self.problems or self.newredirs:
+ self.log_text.sort()
+ self.problems.sort()
+ self.newredirs.sort()
+ message = i18n.twtranslate(self.site, 'category_redirect-log-new')
+ date_line = '\n== {}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}Z ==\n' \
+ .format(*time.gmtime()[:6])
+ self.log_page.text = (date_line
+ + '\n'.join(self.log_text)
+ + '\n* ' + message + '\n'
+ + '\n'.join(self.newredirs)
+ + '\n' + '\n'.join(self.problems)
+ + '\n' + self.get_log_text())
+ self.log_page.save(comment)
+
if self.edit_requests:
edit_request_page = pywikibot.Page(
self.site, f'User:{self.user}/category edit requests')
@@ -461,8 +561,12 @@
else:
# generic handling of we have boolean options
options[arg[1:]] = True
- bot = CategoryRedirectBot(**options)
- bot.run()
+ try:
+ bot = CategoryRedirectBot(**options)
+ except Error as e:
+ pywikibot.bot.suggest_help(exception=e)
+ else:
+ bot.run()
if __name__ == '__main__':
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/979900?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I27445dfe11f47f5867a64a20a528c28d79dfb0dc
Gerrit-Change-Number: 979900
Gerrit-PatchSet: 17
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Aram <[email protected]>
Gerrit-Reviewer: D3r1ck01 <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Mpaa <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
