jenkins-bot has submitted this change and it was merged.
Change subject: [bugfix] compat -imagelinks is -imageused in core
......................................................................
[bugfix] compat -imagelinks is -imageused in core
- reorder summary input so -help message will be shown if
no generator is given.
- -file option does not expect pageName
Change-Id: Id5eb5dd6c42d024bc9758475d82641fcb396977f
---
M scripts/delete.py
1 file changed, 21 insertions(+), 20 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/delete.py b/scripts/delete.py
index 60c9ed8..40be384 100644
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -94,8 +94,8 @@
summary = arg[len('-summary:'):]
elif arg.startswith('-images'):
pywikibot.output('\n\03{lightred}-image option is deprecated. '
- 'Please use -imagelinks instead.\03{default}\n')
- localargs.append('-imagelinks' + arg[7:])
+ 'Please use -imageused instead.\03{default}\n')
+ localargs.append('-imageused' + arg[7:])
elif arg.startswith('-undelete'):
undelete = True
else:
@@ -104,28 +104,29 @@
if found:
pageName = arg[found:]
- if pageName and not summary:
- if arg.startswith('-category'):
- summary = i18n.twtranslate(mysite, 'delete-from-category',
- {'page': pageName})
- elif arg.startswith('-links'):
- summary = i18n.twtranslate(mysite, 'delete-linked-pages',
- {'page': pageName})
- elif arg.startswith('-ref'):
- summary = i18n.twtranslate(mysite, 'delete-referring-pages',
- {'page': pageName})
- elif arg.startswith('-imagelinks'):
- summary = i18n.twtranslate(mysite, 'delete-images',
- {'page': pageName})
+ if not summary:
+ if pageName:
+ if arg.startswith('-cat') or arg.startswith('-subcats'):
+ summary = i18n.twtranslate(mysite, 'delete-from-category',
+ {'page': pageName})
+ elif arg.startswith('-links'):
+ summary = i18n.twtranslate(mysite, 'delete-linked-pages',
+ {'page': pageName})
+ elif arg.startswith('-ref'):
+ summary = i18n.twtranslate(mysite, 'delete-referring-pages',
+ {'page': pageName})
+ elif arg.startswith('-imageused'):
+ summary = i18n.twtranslate(mysite, 'delete-images',
+ {'page': pageName})
elif arg.startswith('-file'):
summary = i18n.twtranslate(mysite, 'delete-from-file')
- if summary is None:
- summary = pywikibot.input(u'Enter a reason for the %sdeletion:'
- % ['', 'un'][undelete])
generator = genFactory.getCombinedGenerator()
+ # We are just deleting pages, so we have no need of using a preloading
+ # page generator to actually get the text of those pages.
if generator:
- # We are just deleting pages, so we have no need of using a preloading
- # page generator to actually get the text of those pages.
+ if summary is None:
+ summary = pywikibot.input(u'Enter a reason for the %sdeletion:'
+ % ['', 'un'][undelete])
bot = DeletionRobot(generator, summary, always, undelete)
bot.run()
else:
--
To view, visit
https://gerrit.wikimedia.org/r/113123
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5eb5dd6c42d024bc9758475d82641fcb396977f
Gerrit-PatchSet: 7
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Nemo bis <federicoleva(a)tiscali.it>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>