jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/540854 )
Change subject: [IMPR] Improvements for askForHints (3)
......................................................................
[IMPR] Improvements for askForHints (3)
- decrease nested code
Change-Id: I8aea761ed32046fd843e734205479ac1989f84d9
---
M scripts/interwiki.py
1 file changed, 31 insertions(+), 29 deletions(-)
Approvals:
D3r1ck01: Looks good to me, but someone else must approve
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 36bcc7f..e9c6264 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -1170,43 +1170,45 @@
if not self.workonme: # we don't work on it anyway
return
- if ((self.untranslated or self.conf.askhints)
+ if not (
+ (self.untranslated or self.conf.askhints)
and not self.hintsAsked
and self.originPage
and self.originPage.exists()
and not self.originPage.isRedirectPage()
and not self.originPage.isCategoryRedirect()):
+ return
- self.hintsAsked = True
- if not self.conf.untranslated:
- return
+ self.hintsAsked = True
+ if not self.conf.untranslated:
+ return
- t = self.conf.showtextlink
- if t:
+ t = self.conf.showtextlink
+ if t:
+ pywikibot.output(self.originPage.get()[:t])
+
+ while True:
+ newhint = pywikibot.input('Give a hint (? to see pagetext):')
+ if not newhint:
+ break
+ if newhint == '?':
+ t += self.conf.showtextlinkadd
pywikibot.output(self.originPage.get()[:t])
-
- while True:
- newhint = pywikibot.input('Give a hint (? to see pagetext):')
- if not newhint:
- break
- if newhint == '?':
- t += self.conf.showtextlinkadd
- pywikibot.output(self.originPage.get()[:t])
- elif ':' not in newhint:
- pywikibot.output(fill(
- 'Please enter a hint in the format language:pagename '
- 'or type nothing if you do not have a hint.'))
- else:
- links = titletranslate.translate(
- self.originPage,
- hints=[newhint],
- auto=self.conf.auto,
- removebrackets=self.conf.hintnobracket)
- for link in links:
- page = pywikibot.Page(link)
- self.addIfNew(page, counter, None)
- if self.conf.hintsareright:
- self.hintedsites.add(page.site)
+ elif ':' not in newhint:
+ pywikibot.output(fill(
+ 'Please enter a hint in the format language:pagename '
+ 'or type nothing if you do not have a hint.'))
+ else:
+ links = titletranslate.translate(
+ self.originPage,
+ hints=[newhint],
+ auto=self.conf.auto,
+ removebrackets=self.conf.hintnobracket)
+ for link in links:
+ page = pywikibot.Page(link)
+ self.addIfNew(page, counter, None)
+ if self.conf.hintsareright:
+ self.hintedsites.add(page.site)
def batchLoaded(self, counter):
"""
--
To view, visit https://gerrit.wikimedia.org/r/540854
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8aea761ed32046fd843e734205479ac1989f84d9
Gerrit-Change-Number: 540854
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: D3r1ck01 <[email protected]>
Gerrit-Reviewer: Dalba <[email protected]>
Gerrit-Reviewer: Dvorapa <[email protected]>
Gerrit-Reviewer: Framawiki <[email protected]>
Gerrit-Reviewer: jenkins-bot (75)
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
