jenkins-bot merged this change.

View Change

[IMPR] Improvements for askForHints (1)

- separate checkings each in one line
- reorder checks in while statement
- use fill for long message to prevent ugly line break

Change-Id: I08e5fa8bad281050bc53c73131d83a10c77fe928
---
M scripts/interwiki.py
1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index c3ac569..35da344 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -355,6 +355,7 @@
 import shelve
 import socket
 import sys
+from textwrap import fill
 
 import pywikibot
 
@@ -1166,33 +1167,35 @@
 
     def askForHints(self, counter):
         """Ask for hints to other sites."""
-        if not self.workonme:
-            # Do not ask hints for pages that we don't work on anyway
+        if not self.workonme:  # we don't work on it anyway
             return
-        if (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():
-            # Only once!
+
+        if ((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()):
+
             self.hintsAsked = True
             if self.conf.untranslated:
                 t = self.conf.showtextlink
                 if t:
                     pywikibot.output(self.originPage.get()[:t])
-                # loop
+
                 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 newhint and ':' not in newhint:
-                        pywikibot.output(
+                    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.')
-                    elif not newhint:
-                        break
+                            'have a hint.'))
                     else:
                         links = titletranslate.translate(
                             self.originPage,

To view, visit change 540852. To unsubscribe, or for help writing mail filters, visit settings.