Merge "solve_disambiguation.py: Do not suggest duplicate alternatives"

scripts/solve_disambiguation.py

@@ -71,7 +71,7 @@
 # (C) Daniel Herding, 2004
 # (C) Andre Engels, 2003-2004
 # (C) WikiWichtel, 2004
-# (C) Pywikibot team, 2003-2015
+# (C) Pywikibot team, 2003-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -651,9 +651,16 @@ def checkContents(self, text):
         return None
 
     def makeAlternativesUnique(self):
-        """Remove duplicate entries stable."""
-        unique = set(self.alternatives)
-        self.alternatives = [alt for alt in self.alternatives if alt in unique]
+        """Remove duplicate items from self.alternatives.
+
+        Preserve the order of alternatives.
+        @rtype: None
+
+        """
+        seen = set()
+        self.alternatives = [
+            i for i in self.alternatives if i not in seen and not seen.add(i)
+        ]
 
     def listAlternatives(self):
         """Show a list of alternatives."""
@@ -954,7 +961,7 @@ def treat(self, refPage, disambPage):
     def findAlternatives(self, disambPage):
         """Extend self.alternatives using correctcap of disambPage.linkedPages.
 
-        @param disambPage: the disabiguation page
+        @param disambPage: the disambiguation page
         @type disambPage: pywikibot.Page
         @return: True if everything goes fine, False otherwise
         @rtype: bool
@@ -1002,6 +1009,7 @@ def findAlternatives(self, disambPage):
                         u"The specified page is not a redirect. Skipping.")
                     return False
         elif self.getAlternatives:
+            # not disambPage.isRedirectPage() or self.primary
             try:
                 if self.primary:
                     try: