Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/270311
Change subject: [IMPR] use Bot.user_confirm() ...................................................................... [IMPR] use Bot.user_confirm() - input_choice never returns a key not passed to the method. Checking undefined key is obsolete - Also it is not necessary to pass 'n' key because it is passed with the end of the if statement Change-Id: Ib3b22caefde66becf116d8cc97deef5c28fbc212 --- M scripts/movepages.py 1 file changed, 2 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/11/270311/1 diff --git a/scripts/movepages.py b/scripts/movepages.py index b276b9c..c2e3046 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -109,20 +109,8 @@ if self.getOption('prefix'): newPageTitle = (u'%s%s' % (self.getOption('prefix'), pagetitle)) if self.getOption('prefix') or self.appendAll or self.regexAll: - if not self.getOption('always'): - choice2 = pywikibot.input_choice( - u'Change the page title to "%s"?' % newPageTitle, - [('yes', 'y'), ('no', 'n'), ('all', 'a')]) - if choice2 == 'y': - self.moveOne(page, newPageTitle) - elif choice2 == 'a': - self.options['always'] = True - self.moveOne(page, newPageTitle) - elif choice2 == 'n': - pass - else: - self.treat(page) - else: + if self.user_confirm('Change the page title to "%s"?' + % newPageTitle): self.moveOne(page, newPageTitle) else: choice = pywikibot.input_choice(u'What do you want to do?', @@ -153,10 +141,6 @@ elif choice2 == 'a': self.appendAll = True self.moveOne(page, newPageTitle) - elif choice2 == 'n': - pass - else: - self.treat(page) elif choice == 'r': searchPattern = pywikibot.input(u'Enter the search pattern:') self.replacePattern = pywikibot.input( @@ -183,14 +167,6 @@ elif choice2 == 'a': self.regexAll = True self.moveOne(page, newPageTitle) - elif choice2 == 'n': - pass - else: - self.treat(page) - elif choice == 'n': - pass - else: - self.treat(page) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/270311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3b22caefde66becf116d8cc97deef5c28fbc212 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <i...@gno.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits