jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352161 )
Change subject: [IMPR] Use input_yn in states_redirect.py
......................................................................
[IMPR] Use input_yn in states_redirect.py
Change-Id: I743f784061f739b4321d2365698f0b51a6139d46
---
M scripts/states_redirect.py
1 file changed, 5 insertions(+), 11 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py
index 069c615..fde07ba 100755
--- a/scripts/states_redirect.py
+++ b/scripts/states_redirect.py
@@ -15,7 +15,7 @@
"""
#
# (C) Andre Engels, 2004
-# (C) Pywikibot team, 2004-2014
+# (C) Pywikibot team, 2004-2017
#
# Distributed under the terms of the MIT license.
#
@@ -97,7 +97,6 @@
u"Please check page!"
% pl.title())
except pywikibot.NoPage:
- change = ''
if page.isRedirectPage():
p2 = page.getRedirectTarget()
pywikibot.output(
@@ -105,17 +104,12 @@
u'to "%s" to avoid double redirect.' %
p2.title())
else:
p2 = page
- if self.force:
- change = 'y'
- else:
- change = pywikibot.input_choice(
- u'Create redirect %s?' % pl.title(),
- (('yes', 'y'), ('no', 'n')))
- if change == 'y':
+ if self.force or pywikibot.input_yn('Create redirect {0}?'
+ .format(pl.title())):
pl.set_redirect_target(
p2, create=True,
- summary=i18n.twtranslate(self.site,
- 'states_redirect-comment'))
+ summary=i18n.twtranslate(
+ self.site, 'states_redirect-comment'))
def main(*args):
--
To view, visit
https://gerrit.wikimedia.org/r/352161
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I743f784061f739b4321d2365698f0b51a6139d46
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>