jenkins-bot has submitted this change and it was merged.
Change subject: [BUGFIX] code improvements and bugfixes: ......................................................................
[BUGFIX] code improvements and bugfixes:
- remove obsolete variables, code stuff and "nosubcat" option which was not implemented - include revision: 0b888f24b532d54ee93574632b34c162fbe77ba0 made by Merlijn van Deen: mysite was not defined. pywikibot.handleArgs is guaranteed to return a list (as opposed to a generator) after parsing all global arguments (such as -lang and -family). This means it's safe to call pywikibot.getSite immediately after handleArgs, but before handling local arguments. - synchronize with compat - pep8 changes
Change-Id: Ie3b2da1e5a0ff7ee8f82bb10891ce4bb7075a970 --- M scripts/delete.py 1 file changed, 15 insertions(+), 16 deletions(-)
Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/delete.py b/scripts/delete.py index 25b659e..cf8c3d4 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -9,7 +9,6 @@
-page: Delete specified page -cat: Delete all pages in the given category. --nosubcats: Don't delete pages in the subcategories. -links: Delete all pages linked from a given page. -file: Delete all pages listed in a text file. -ref: Delete all pages referring from a given page. @@ -34,7 +33,8 @@ #
import pywikibot -from pywikibot import i18n, config, catlib, pagegenerators +from pywikibot import i18n +from pywikibot import pagegenerators
class DeletionRobot: @@ -65,21 +65,17 @@ def main(): genFactory = pagegenerators.GeneratorFactory() pageName = '' - singlePage = '' summary = '' always = False - doSinglePage = False - doCategory = False - deleteSubcategories = True - doRef = False - doLinks = False doImages = False undelete = False - fileName = '' generator = None
# read command line parameters - for arg in pywikibot.handleArgs(): + localargs = pywikibot.handleArgs() + mysite = pywikibot.getSite() + + for arg in localargs: if arg == '-always': always = True elif arg.startswith('-summary'): @@ -87,8 +83,6 @@ summary = pywikibot.input(u'Enter a reason for the deletion:') else: summary = arg[len('-summary:'):] - elif arg.startswith('-nosubcats'): - deleteSubcategories = False elif arg.startswith('-images'): doImages = True if len(arg) == len('-images'): @@ -102,14 +96,17 @@ genFactory.handleArg(arg) if not summary: if arg.startswith('-category'): - summary = i18n.twtranslate(mysite, 'delete-from-category', {'page': pageName}) + summary = i18n.twtranslate(mysite, 'delete-from-category', + {'page': pageName}) elif arg.startswith('-links'): - summary = i18n.twtranslate(mysite, 'delete-linked-pages', {'page': pageName}) + summary = i18n.twtranslate(mysite, 'delete-linked-pages', + {'page': pageName}) elif arg.startswith('-ref'): - summary = i18n.twtranslate(mysite, 'delete-referring-pages', {'page': pageName}) + summary = i18n.twtranslate(mysite, 'delete-referring-pages', + {'page': pageName}) elif arg.startswith('-file'): summary = i18n.twtranslate(mysite, 'delete-from-file') - mysite = pywikibot.getSite() + if doImages: if not summary: summary = i18n.twtranslate(mysite, 'delete-images', @@ -131,6 +128,8 @@ # page generator to actually get the text of those pages. bot = DeletionRobot(generator, summary, always, undelete) bot.run() + + if __name__ == "__main__": try: main()