jenkins-bot has submitted this change and it was merged. Change subject: Movepages.py: Fix wrong parameter name and clean-up ...................................................................... Movepages.py: Fix wrong parameter name and clean-up leaveRedirect param is not valid param for page.move() in core added -notalkpage switch, removal of unused variables. Change-Id: I8b49a1f74a43dae1f543fd414d5a5f9b5e1d357c --- M scripts/movepages.py 1 file changed, 20 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/movepages.py b/scripts/movepages.py index 09da6ec..afab0ca 100644 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -13,6 +13,8 @@ -noredirect Leave no redirect behind. +-notalkpage Do not move this page's talk page (if it exists) + -prefix Move pages by adding a namespace prefix to the names of the pages. (Will remove the old namespace prefix if any) Argument can also be given as "-prefix:namespace:". @@ -53,14 +55,18 @@ class MovePagesBot: - def __init__(self, generator, addprefix, noredirect, always, skipredirects, - summary): + def __init__(self, generator, addprefix, noredirect, movetalkpage, + always, skipredirects, summary): self.generator = generator self.addprefix = addprefix - self.leaveRedirect = not noredirect + self.noredirect = noredirect + self.movetalkpage = movetalkpage self.always = always self.skipredirects = skipredirects self.summary = summary + self.appendAll = False + self.regexAll = False + self.noNamespace = False def moveOne(self, page, newPageTitle): try: @@ -70,7 +76,8 @@ pywikibot.output(u'Moving page %s to [[%s]]' % (page.title(asLink=True), newPageTitle)) - page.move(newPageTitle, msg, leaveRedirect=self.leaveRedirect) + page.move(newPageTitle, reason=msg, movetalkpage=self.movetalkpage, + deleteAndMove=self.noredirect) except pywikibot.NoPage: pywikibot.output(u'Page %s does not exist!' % page.title()) except pywikibot.IsRedirectPage: @@ -140,7 +147,7 @@ u'Do you want to remove the namespace prefix "%s:"?' % namesp, ['yes', 'no'], ['y', 'n']) if choice2 == 'y': - noNamespace = True + self.noNamespace = True else: newPageTitle = (u'%s:%s' % (namesp, newPageTitle)) choice2 = pywikibot.inputChoice( @@ -173,7 +180,7 @@ if choice2 == 'y': newPageTitle = self.regex.sub( self.replacePattern, page.title(withNamespace=False)) - noNamespace = True + self.noNamespace = True else: newPageTitle = self.regex.sub(self.replacePattern, page.title()) @@ -200,9 +207,6 @@ self.treat(page) def run(self): - self.appendAll = False - self.regexAll = False - self.noNamespace = False for page in self.generator: self.treat(page) @@ -211,8 +215,8 @@ gen = None prefix = None oldName = None - newName = None noredirect = False + movetalkpage = True always = False skipredirects = False summary = None @@ -242,6 +246,8 @@ u'file %s contains odd number of links' % filename) elif arg == '-noredirect': noredirect = True + elif arg == '-notalkpage': + movetalkpage = False elif arg == '-always': always = True elif arg == '-skipredirects': @@ -273,16 +279,16 @@ pywikibot.warning(u'-from:%s without -to:' % oldName) for pair in fromToPairs: page = pywikibot.Page(pywikibot.Site(), pair[0]) - bot = MovePagesBot(None, prefix, noredirect, always, skipredirects, - summary) + bot = MovePagesBot(None, prefix, noredirect, movetalkpage, always, + skipredirects, summary) bot.moveOne(page, pair[1]) if not gen: gen = genFactory.getCombinedGenerator() if gen: preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = MovePagesBot(preloadingGen, prefix, noredirect, always, - skipredirects, summary) + bot = MovePagesBot(preloadingGen, prefix, noredirect, movetalkpage, + always, skipredirects, summary) bot.run() elif not fromToPairs: pywikibot.showHelp() -- To view, visit https://gerrit.wikimedia.org/r/125273 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b49a1f74a43dae1f543fd414d5a5f9b5e1d357c Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(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: jenkins-bot <>