| Index: trunk/pywikipedia/solve_disambiguation.py |
| — | — | @@ -126,97 +126,102 @@ |
| 127 | 127 | # instead of _ |
| 128 | 128 | |
| 129 | 129 | ignore_title = { |
| 130 | | - 'nl':('Wikipedia:Onderhoudspagina', |
| 131 | | - 'Wikipedia:Doorverwijspagina', |
| 132 | | - 'Wikipedia:Lijst van alle tweeletter-combinaties', |
| 133 | | - 'Gebruiker:Hooft/robot/Interwiki/lijst van problemen', |
| 134 | | - 'Wikipedia:Woorden die niet als zoekterm gebruikt kunnen worden', |
| 135 | | - 'Gebruiker:Puckly/Bijdragen', |
| 136 | | - 'Gebruiker:Waerth/bijdragen', |
| 137 | | - "Wikipedia:Project aanmelding bij startpagina's", |
| 138 | | - 'Gebruiker:Gustar/aantekeningen denotatie annex connotatie', |
| 139 | | - 'Wikipedia:Protection log', |
| 140 | | - 'Gebruiker:Pven/Romeinse cijfers', |
| 141 | | - 'Categorie:Doorverwijspagina', |
| 142 | | - 'Wikipedia:Ongelijke redirects', |
| 143 | | - 'Gebruiker:Cars en travel', |
| 144 | | - 'Wikipedia:Archief*', |
| 145 | | - 'Overleg Wikipedia:Logboek*', |
| 146 | | - 'Gebruiker:Rex/Gestarte artikelen' |
| 147 | | - ), |
| 148 | | - 'en':('Wikipedia:Links to disambiguating pages', |
| 149 | | - 'Wikipedia:Disambiguation pages with links', |
| 150 | | - 'Wikipedia:Multiple-place names \([A-Z]\)', |
| 151 | | - 'Wikipedia:Non-unique personal name', |
| 152 | | - "User:Jerzy/Disambiguation Pages i've Editted", |
| 153 | | - 'User:Gareth Owen/inprogress', |
| 154 | | - 'TLAs from [A-Z][A-Z][A-Z] to [A-Z][A-Z][A-Z]', |
| 155 | | - 'List of all two-letter combinations', |
| 156 | | - 'User:Daniel Quinlan/redirects.+', |
| 157 | | - 'User:Oliver Pereira/stuff', |
| 158 | | - 'Wikipedia:French Wikipedia language links', |
| 159 | | - 'Wikipedia:Polish language links', |
| 160 | | - 'Wikipedia:Undisambiguated abbreviations/.+', |
| 161 | | - 'List of acronyms and initialisms', |
| 162 | | - 'Wikipedia:Usemod article histories', |
| 163 | | - 'User:Pizza Puzzle/stuff', |
| 164 | | - 'List of generic names of political parties', |
| 165 | | - 'Talk:List of initialisms/marked', |
| 166 | | - 'Talk:List of initialisms/sorted', |
| 167 | | - 'Talk:Programming language', |
| 168 | | - 'Talk:SAMPA/To do', |
| 169 | | - "Wikipedia:Outline of Roget's Thesaurus", |
| 170 | | - 'User:Wik/Articles', |
| 171 | | - 'User:Egil/Sandbox', |
| 172 | | - 'Wikipedia talk:Make only links relevant to the context', |
| 173 | | - 'Wikipedia:Common words, searching for which is not possible' |
| 174 | | - ), |
| 175 | | - 'da':('Wikipedia:Links til sider med flertydige titler'), |
| 176 | | - 'fr':(u'Wikipédia:Liens aux pages d\'homonymie', |
| 177 | | - u'Wikipédia:Homonymie', |
| 178 | | - u'Wikipédia:Homonymie/Homonymes dynastiques', |
| 179 | | - u'Wikipédia:Prise de décision, noms des membres de dynasties/liste des dynastiens', |
| 180 | | - u'Liste de toutes les combinaisons de deux lettres', |
| 181 | | - u'Wikipédia:Log d\'upload/.*', |
| 182 | | - u'Sigles de trois lettres de [A-Z]AA à [A-Z]ZZ', |
| 183 | | - u'Wikipédia:Pages sans interwiki,.' |
| 184 | | - ), |
| 185 | | - 'de':( |
| 186 | | - u'100 Wörter des 21. Jahrhunderts', |
| 187 | | - u'Abkürzungen/[A-Z]', |
| 188 | | - u'Benutzer:Achim Raschka/Dreibuchstabenkürzel von [A-Z][A-Z][A-Z] bis [A-Z][A-Z][A-Z]', |
| 189 | | - u'Benutzer:Achim Raschka/Liste aller 2-Buchstaben-Kombinationen', |
| 190 | | - u'Benutzer:Katharina/Begriffsklärungen', |
| 191 | | - u'Benutzer:Tsor/Begriffsklärungen', |
| 192 | | - u'Benutzer:SirJective/Klammerzusatz', |
| 193 | | - u'Benutzer:Zwobot/Probleme', |
| 194 | | - u'Benutzer Diskussion:.+', |
| 195 | | - u'GISLexikon \([A-Z]\)', |
| 196 | | - u'Lehnwort', |
| 197 | | - u'Liste aller 2-Buchstaben-Kombinationen', |
| 198 | | - u'Wikipedia:Archiv:.+', |
| 199 | | - u'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', |
| 200 | | - u'Wikipedia:Begriffsklärung.*', |
| 201 | | - u'Wikipedia:Dreibuchstabenkürzel von [A-Z][A-Z][A-Z] bis [A-Z][A-Z][A-Z]', |
| 202 | | - u'Wikipedia:Geographisch mehrdeutige Bezeichnungen', |
| 203 | | - u'Wikipedia:Kurze Artikel', |
| 204 | | - u'Wikipedia:Liste mathematischer Themen/BKS', |
| 205 | | - u'Wikipedia:Liste mathematischer Themen/Redirects', |
| 206 | | - u'Wikipedia:Löschkandidaten/.+', |
| 207 | | - u'Wikipedia:Qualitätsoffensive/UNO', #requested by Benutzer:Addicted |
| 208 | | - u'Wikipedia:WikiProjekt Altertumswissenschaft/.+' |
| 209 | | - ), |
| 210 | | - 'pt':( |
| 211 | | - u'Categoria:Desambiguação', |
| 212 | | - u'Wikipedia:Links para desambiguar páginas', |
| 213 | | - u'Wikipedia:Desambiguação', |
| 214 | | - u'Wikipedia:Lista de páginas de desambiguação', |
| 215 | | - u'Usuário:Nuno Tavares/Stats/Ambiguações', |
| 216 | | - ), |
| 217 | | - 'fy':( |
| 218 | | - u'Wikipedy:Fangnet', |
| 219 | | - ), |
| 220 | | - } |
| | 130 | + 'nl': [ |
| | 131 | + 'Wikipedia:Onderhoudspagina', |
| | 132 | + 'Wikipedia:Doorverwijspagina', |
| | 133 | + 'Wikipedia:Lijst van alle tweeletter-combinaties', |
| | 134 | + 'Gebruiker:Hooft/robot/Interwiki/lijst van problemen', |
| | 135 | + 'Wikipedia:Woorden die niet als zoekterm gebruikt kunnen worden', |
| | 136 | + 'Gebruiker:Puckly/Bijdragen', |
| | 137 | + 'Gebruiker:Waerth/bijdragen', |
| | 138 | + "Wikipedia:Project aanmelding bij startpagina's", |
| | 139 | + 'Gebruiker:Gustar/aantekeningen denotatie annex connotatie', |
| | 140 | + 'Wikipedia:Protection log', |
| | 141 | + 'Gebruiker:Pven/Romeinse cijfers', |
| | 142 | + 'Categorie:Doorverwijspagina', |
| | 143 | + 'Wikipedia:Ongelijke redirects', |
| | 144 | + 'Gebruiker:Cars en travel', |
| | 145 | + 'Wikipedia:Archief*', |
| | 146 | + 'Overleg Wikipedia:Logboek*', |
| | 147 | + 'Gebruiker:Rex/Gestarte artikelen' |
| | 148 | + ], |
| | 149 | + 'en': [ |
| | 150 | + 'Wikipedia:Links to disambiguating pages', |
| | 151 | + 'Wikipedia:Disambiguation pages with links', |
| | 152 | + 'Wikipedia:Multiple-place names \([A-Z]\)', |
| | 153 | + 'Wikipedia:Non-unique personal name', |
| | 154 | + "User:Jerzy/Disambiguation Pages i've Editted", |
| | 155 | + 'User:Gareth Owen/inprogress', |
| | 156 | + 'TLAs from [A-Z][A-Z][A-Z] to [A-Z][A-Z][A-Z]', |
| | 157 | + 'List of all two-letter combinations', |
| | 158 | + 'User:Daniel Quinlan/redirects.+', |
| | 159 | + 'User:Oliver Pereira/stuff', |
| | 160 | + 'Wikipedia:French Wikipedia language links', |
| | 161 | + 'Wikipedia:Polish language links', |
| | 162 | + 'Wikipedia:Undisambiguated abbreviations/.+', |
| | 163 | + 'List of acronyms and initialisms', |
| | 164 | + 'Wikipedia:Usemod article histories', |
| | 165 | + 'User:Pizza Puzzle/stuff', |
| | 166 | + 'List of generic names of political parties', |
| | 167 | + 'Talk:List of initialisms/marked', |
| | 168 | + 'Talk:List of initialisms/sorted', |
| | 169 | + 'Talk:Programming language', |
| | 170 | + 'Talk:SAMPA/To do', |
| | 171 | + "Wikipedia:Outline of Roget's Thesaurus", |
| | 172 | + 'User:Wik/Articles', |
| | 173 | + 'User:Egil/Sandbox', |
| | 174 | + 'Wikipedia talk:Make only links relevant to the context', |
| | 175 | + 'Wikipedia:Common words, searching for which is not possible' |
| | 176 | + ], |
| | 177 | + 'da': [ |
| | 178 | + 'Wikipedia:Links til sider med flertydige titler' |
| | 179 | + ], |
| | 180 | + 'fr': [ |
| | 181 | + u'Wikipédia:Liens aux pages d\'homonymie', |
| | 182 | + u'Wikipédia:Homonymie', |
| | 183 | + u'Wikipédia:Homonymie/Homonymes dynastiques', |
| | 184 | + u'Wikipédia:Prise de décision, noms des membres de dynasties/liste des dynastiens', |
| | 185 | + u'Liste de toutes les combinaisons de deux lettres', |
| | 186 | + u'Wikipédia:Log d\'upload/.*', |
| | 187 | + u'Sigles de trois lettres de [A-Z]AA à [A-Z]ZZ', |
| | 188 | + u'Wikipédia:Pages sans interwiki,.' |
| | 189 | + ], |
| | 190 | + 'de': [ |
| | 191 | + u'100 Wörter des 21. Jahrhunderts', |
| | 192 | + u'Abkürzungen/[A-Z]', |
| | 193 | + u'Benutzer:Achim Raschka/Dreibuchstabenkürzel von [A-Z][A-Z][A-Z] bis [A-Z][A-Z][A-Z]', |
| | 194 | + u'Benutzer:Achim Raschka/Liste aller 2-Buchstaben-Kombinationen', |
| | 195 | + u'Benutzer:Katharina/Begriffsklärungen', |
| | 196 | + u'Benutzer:Tsor/Begriffsklärungen', |
| | 197 | + u'Benutzer:SirJective/Klammerzusatz', |
| | 198 | + u'Benutzer:Zwobot/Probleme', |
| | 199 | + u'Benutzer Diskussion:.+', |
| | 200 | + u'GISLexikon \([A-Z]\)', |
| | 201 | + u'Lehnwort', |
| | 202 | + u'Liste aller 2-Buchstaben-Kombinationen', |
| | 203 | + u'Wikipedia:Archiv:.+', |
| | 204 | + u'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', |
| | 205 | + u'Wikipedia:Begriffsklärung.*', |
| | 206 | + u'Wikipedia:Dreibuchstabenkürzel von [A-Z][A-Z][A-Z] bis [A-Z][A-Z][A-Z]', |
| | 207 | + u'Wikipedia:Geographisch mehrdeutige Bezeichnungen', |
| | 208 | + u'Wikipedia:Kurze Artikel', |
| | 209 | + u'Wikipedia:Liste mathematischer Themen/BKS', |
| | 210 | + u'Wikipedia:Liste mathematischer Themen/Redirects', |
| | 211 | + u'Wikipedia:Löschkandidaten/.+', |
| | 212 | + u'Wikipedia:Qualitätsoffensive/UNO', #requested by Benutzer:Addicted |
| | 213 | + u'Wikipedia:WikiProjekt Altertumswissenschaft/.+' |
| | 214 | + ], |
| | 215 | + 'pt': [ |
| | 216 | + u'Categoria:Desambiguação', |
| | 217 | + u'Wikipedia:Links para desambiguar páginas', |
| | 218 | + u'Wikipedia:Desambiguação', |
| | 219 | + u'Wikipedia:Lista de páginas de desambiguação', |
| | 220 | + u'Usuário:Nuno Tavares/Stats/Ambiguações', |
| | 221 | + ], |
| | 222 | + 'fy': [ |
| | 223 | + u'Wikipedy:Fangnet', |
| | 224 | + ], |
| | 225 | +} |
| 221 | 226 | |
| 222 | 227 | class ReferringPageGenerator: |
| 223 | 228 | def __init__(self, disambPl, primary=False): |
| — | — | @@ -595,10 +600,9 @@ |
| 596 | 601 | |
| 597 | 602 | def run(self): |
| 598 | 603 | if self.main_only: |
| 599 | | - if ignore_title.has_key(self.mylang): |
| 600 | | - ignore_title[self.mylang] += self.mysite.namespaces() |
| 601 | | - else: |
| 602 | | - ignore_title[self.mylang] = self.mysite.namespaces() |
| | 604 | + if not ignore_title.has_key(self.mylang): |
| | 605 | + ignore_title[self.mylang] = [] |
| | 606 | + ignore_title[self.mylang] += [u'%s:' % namespace for namespace in self.mysite.namespaces()] |
| 603 | 607 | |
| 604 | 608 | for disambTitle in self.page_list: |
| 605 | 609 | # when run with -redir argument, there's another summary message |