Pywikipedia-svn October 2010

pywikipedia-svn@lists.wikimedia.org

6 participants
90 discussions

SVN: [8620] trunk/pywikipedia/commonscat.py
by xqt＠svn.wikimedia.org 07 Oct '10

07 Oct '10

Revision: 8620 Author: xqt Date: 2010-10-07 11:56:18 +0000 (Thu, 07 Oct 2010) Log Message: ----------- ignore blanks in template parameters Modified Paths: -------------- trunk/pywikipedia/commonscat.py Modified: trunk/pywikipedia/commonscat.py =================================================================== --- trunk/pywikipedia/commonscat.py 2010-10-07 08:51:35 UTC (rev 8619) +++ trunk/pywikipedia/commonscat.py 2010-10-07 11:56:18 UTC (rev 8620) @@ -282,7 +282,7 @@ else: for (inPageTemplate, param) in templatesWithParams: if inPageTemplate == template[0] \ - and template[1] in param[0]: + and template[1] in param[0].replace(' ',''): return True return False

1 0

SVN: [8619] trunk/pywikipedia/query.py
by xqt＠svn.wikimedia.org 07 Oct '10

07 Oct '10

Revision: 8619 Author: xqt Date: 2010-10-07 08:51:35 +0000 (Thu, 07 Oct 2010) Log Message: ----------- GetDisambigTemplates(site) removed - it never worked Modified Paths: -------------- trunk/pywikipedia/query.py Modified: trunk/pywikipedia/query.py =================================================================== --- trunk/pywikipedia/query.py 2010-10-07 08:39:30 UTC (rev 8618) +++ trunk/pywikipedia/query.py 2010-10-07 08:51:35 UTC (rev 8619) @@ -195,42 +195,6 @@ params = CombineParams( params, extraParams ) return GetData(params, site) -def GetDisambigTemplates(site): - """This method will return a set of disambiguation templates. - Template:Disambig is always assumed to be default, and will be - appended (in localized format) regardless of its existence. - The rest will be aquired from the Wikipedia:Disambiguation Templates page. - Only links to templates will be used from that page. - """ - - disambigs = set() - disambigName = wikipedia.translate(site, site.family.disambiguationTemplates()) - disListName = u"Wikipedia:Disambiguation Templates" - disListId = 0 - - templateNames = GetLinks(site, [disListName, disambigName]) - for id, page in templateNames['pages'].iteritems(): - if page['title'] in disambigName: - if 'normalizedTitle' in page: - disambigs.add(page['normalizedTitle']) - elif 'redirect' in page: - disambigs.add(page['title']) - elif page['title'] == disListName: - if 'normalizedTitle' in page: - if 'refid' in page: - disListId = page['refid'] - else: - disListId = id - - # Disambig page was found - if disListId > 0: - page = templateNames['pages'][disListId] - if 'links' in page: - for l in page['links']: - if l['ns'] == 10: - disambigs.add(l['*']) - - return disambigs # # # Helper utilities

1 0

SVN: [8618] branches/rewrite/pywikibot/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 07 Oct '10

07 Oct '10

Revision: 8618 Author: xqt Date: 2010-10-07 08:39:30 +0000 (Thu, 07 Oct 2010) Log Message: ----------- update from trunk r8617 Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-07 08:38:00 UTC (rev 8617) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-07 08:39:30 UTC (rev 8618) @@ -497,11 +497,16 @@ '_default': [12], }, 'de': { - '_default': [0, 12] + '_default': [0, 10, 12], + 'el': [100, 12], + 'es': [104, 12], }, 'fi': { '_default': [0, 12] }, + 'mzn': { + '_default': [0, 12] + }, } self.crossnamespace[5] = { 'fi': {

1 0

SVN: [8617] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 07 Oct '10

07 Oct '10

Revision: 8617 Author: xqt Date: 2010-10-07 08:38:00 +0000 (Thu, 07 Oct 2010) Log Message: ----------- new cross-namespaces for anniversaries Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-10-06 16:04:42 UTC (rev 8616) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-10-07 08:38:00 UTC (rev 8617) @@ -1106,11 +1106,16 @@ '_default': [12], }, 'de': { - '_default': [0, 12] + '_default': [0, 10, 12], + 'el': [100, 12], + 'es': [104, 12], }, 'fi': { '_default': [0, 12] }, + 'mzn': { + '_default': [0, 12] + }, } self.crossnamespace[5] = { 'fi': {

1 0

SVN: [8616] branches/rewrite/pywikibot/families
by xqt＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8616 Author: xqt Date: 2010-10-06 16:04:42 +0000 (Wed, 06 Oct 2010) Log Message: ----------- update from trunk r8614 Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-06 16:04:16 UTC (rev 8615) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-06 16:04:42 UTC (rev 8616) @@ -123,151 +123,94 @@ } self.disambiguationTemplates = { - # set value to None, instead of a list, to retrieve names from - # the live wiki ([[MediaWiki:Disambiguationspage]] + # If no templates are given, retrieve names from the live wiki + # ([[MediaWiki:Disambiguationspage]]) '_default': [u'Disambig'], - 'af': None, - 'als': None, - 'an': None, - 'ang': [u'Disambig', u'Geodis'], - 'ar': None, + 'ang': [u'Geodis'], 'arc': [u'ܕ'], - 'arz': None, 'ast': [u'Dixebra'], 'av': [u'Неоднозначность'], 'ay': [u'Desambiguación'], 'az': [u'Dəqiqləşdirmə'], 'ba': [u'Күп мәғәнәлелек'], - 'bar': None, 'bcl': [u'Clarip'], - 'be': [u'Неадназначнасць', u'Disambig'], - 'be-x-old': [u'Неадназначнасьць', u'Disambig'], - 'bg': None, - 'bn': [u'দ্ব্যর্থতা নিরসন', u'Disambig'], - 'br': None, + 'be': [u'Неадназначнасць'], + 'be-x-old': [u'Неадназначнасьць'], + 'bn': [u'দ্ব্যর্থতা নিরসন'], 'bs': [u'Čvor'], - 'ca': None, - 'ceb': None, 'cdo': [u'Gì-ngiê'], - 'crh': [u'Çoq manalı', u'Disambig'], - 'cs': None, - 'cu': None, - 'cy': None, - 'da': None, - 'de': None, + 'crh': [u'Çoq manalı'], 'dsb': [u'Wěcejwóznamowosć'], - 'el': None, - 'en': None, - 'eo': None, - 'es': None, - 'et': None, - 'eu': None, 'ext': [u'Desambiguáncia'], - 'fa': None, - 'fi': None, 'fiu-vro': [u'Täpsüstüslehekülg'], 'fo': [u'Fleiri týdningar'], - 'fr': None, 'frp': [u'Homonimos'], - 'frr': None, - 'fur': [u'Disambiguazion', u'Disambig'], + 'fur': [u'Disambiguazion'], 'fy': [u'Tfs', u'Neibetsjuttings'], - 'ga': [u'Idirdhealú', u'Disambig'], - 'gan': [u'扤清楚', u'Disambig'], + 'ga': [u'Idirdhealú'], + 'gan': [u'扤清楚'], 'gd': [u'Soilleireachadh'], - 'gl': None, 'gv': [u'Reddaghey'], 'haw': [u'Huaʻōlelo puana like'], - 'he': None, - 'hi': [u'बहुविकल्पी शब्द', u'Disambig',], - 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', u'Nova razdvojba'], - 'hsb': [u'Wjacezmyslnosć', u'Disambig'], - 'ht': [u'Menm non', u'Disambig'], - 'hu': [u'Egyert', u'Disambig', u'Egyért', u'Egyért-redir'], - 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ', u'Disambig'], - 'ia': [u'Disambiguation', u'Disambig'], - 'id': None, - 'io': [u'Homonimo', u'Disambig'], - 'is': None, - 'it': None, - 'ja': None, - 'ka': None, + 'hi': [u'बहुविकल्पी शब्द'], + 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', + u'Nova razdvojba'], + 'hsb': [u'Wjacezmyslnosć'], + 'ht': [u'Menm non'], + 'hu': [u'Egyert', u'Egyért', u'Egyért-redir'], + 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ'], + 'ia': [u'Disambiguation'], + 'io': [u'Homonimo'], 'kab': [u'Asefham'], 'kg': [u'Bisongidila'], - 'kn': [u'ದ್ವಂದ್ವ ನಿವಾರಣೆ'], - 'ko': None, - 'krc': [u'Кёб магъаналы', u'Disambig'], - 'ksh': None, - 'ku': None, - 'kw': None, - 'la': None, - 'lb': [u'Homonymie', u'Disambig', u'Homonymie Ofkierzungen'], + 'krc': [u'Кёб магъаналы'], + 'lb': [u'Homonymie', u'Homonymie Ofkierzungen'], 'li': [u'Verdudeliking', u'Verdudelikingpazjena', u'Vp'], 'lmo': [u'Desambiguació', u'Dezambiguasiú', u'Desambiguazion', u'Desambiguassiú', u'Desambiguació'], - 'ln': None, - 'lt': None, - 'lv': [u'Nozīmju atdalīšana', u'Disambig'], - 'mk': [u'Појаснување', u'Disambig', u'Geodis'], - 'mn': [u'Салаа утгатай', u'Disambig'], - 'ms': [u'Nyahkekaburan', u'Disambig'], - 'mt': None, + 'lv': [u'Nozīmju atdalīšana'], + 'mk': [u'Појаснување', u'Geodis'], + 'mn': [u'Салаа утгатай'], + 'ms': [u'Nyahkekaburan'], 'mzn': [u'گجگجی بایری'], 'nap': [u'Disambigua'], - 'nds': [u'Mehrdüdig Begreep', 'Disambig'], - 'nds-nl': None, - 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', u'Dp cognomen'], - 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', u'Peikar', u'Disambig'], - 'no': [u'Peker', u'Etternavn', u'Disambig', u'Tobokstavsforkortelse', + 'nds': [u'Mehrdüdig Begreep'], + 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', + u'Dp cognomen'], + 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', + u'Peikar'], + 'no': [u'Peker', u'Etternavn' u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], - 'nv': None, 'nrm': [u'Page dé frouque'], - 'oc': [u'Omonimia', u'Disambig'], - 'pl': None, + 'oc': [u'Omonimia'], 'pms': [u'Gestion dij sinònim'], - 'pt': None, - 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], + 'qu': [u"Sut'ichana qillqa", u'SJM'], 'rmy': [u'Dudalipen'], - 'ro': [u'Dezambiguizare', u'Disambig', u'Hndis', u'Dez', u'Dezamb'], - 'ru': None, + 'ro': [u'Dezambiguizare', u'Hndis', u'Dez', u'Dezamb'], 'sc': [u'Disambigua'], - 'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'], - 'simple': None, - 'sh': None, - 'sk': [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'], - 'sl': None, - 'sq': [u'Kthjellim', u'Disambig'], - 'sr': None, + 'scn': [u'Disambigua', u'Sigla2', u'Sigla3'], + 'sk': [u'Rozlišovacia stránka', u'Disambiguation'], + 'sq': [u'Kthjellim'], 'srn': [u'Dp'], 'stq': [u'Begriepskläärenge'], - 'su': None, - 'sv': None, 'sw': [u'Maana'], - 'szl': [u'Disambig'], - 'ta': None, - 'te': None, - 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], - 'th': [u'แก้กำกวม', u'Disambig', u'คำกำกวม'], - 'tl': None, + 'tg': [u'Ибҳомзудоӣ', u'Рафъи ибҳом', u'Disambiguation'], + 'th': [u'แก้กำกวม', u'คำกำกวม'], 'to': [u'Fakaʻuhingakehe'], - 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı', - u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)', + 'tr': [u'Anlam ayrım', u'Anlam ayrımı', + u'Kişi adları (anlam ayrımı)', + u'Yerleşim yerleri (anlam ayrımı)', u'kısaltmalar (anlam ayrımı)'], - 'uk': None, 'vec': [u'Disanbigua', u'Disambigua'], - 'vi': None, 'vls': [u'Db', u'Dp', u'Dpintro'], - 'vo': None, - 'wa': None, - 'war': None, 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'dp', u'Deurverwiespagina'], - 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', u'Letter disambig'], - 'zh-classical': [u'Disambig', u'釋義', u'消歧義'], - 'zh-min-nan': None, - 'zh-yue': [u'搞清楚', u'Disambig'], + 'zh': [u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', + u'Letter disambig'], + 'zh-classical': [u'釋義', u'消歧義'], + 'zh-yue': [u'搞清楚'], } self.disambcatname = { Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-10-06 16:04:16 UTC (rev 8615) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-10-06 16:04:42 UTC (rev 8616) @@ -97,6 +97,7 @@ # after those, in code-alphabetical order. self.interwiki_putfirst = { + 'da': self.alphabetic, 'en': self.alphabetic, 'et': self.alphabetic, 'fi': self.alphabetic,

1 0

SVN: [8615] branches/rewrite/pywikibot/page.py
by xqt＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8615 Author: xqt Date: 2010-10-06 16:04:16 +0000 (Wed, 06 Oct 2010) Log Message: ----------- update from trunk r8613 Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2010-10-06 15:24:15 UTC (rev 8614) +++ branches/rewrite/pywikibot/page.py 2010-10-06 16:04:16 UTC (rev 8615) @@ -493,7 +493,7 @@ """Return True if this is an image description page, False otherwise.""" return self.namespace() == 6 - def isDisambig(self): + def isDisambig(self, get_Index=True): """Return True if this is a disambiguation page, False otherwise. Relies on the presence of specific templates, identified in @@ -501,31 +501,53 @@ pages. By default, loads a list of template names from the Family file; - if the value in the Family file is None, looks for the list on - [[MediaWiki:Disambiguationspage]]. + if the value in the Family file is None no entry was made, looks for + the list on [[MediaWiki:Disambiguationspage]]. If this page does not + exist, take the mediawiki message. + If get_Index is True then also load the templates for index articles + which are given on en-wiki + + Template:Disambig is always assumed to be default, and will be + appended regardless of its existence. + """ if not hasattr(self, "_isDisambig"): if not hasattr(self.site, "_disambigtemplates"): - self.site._disambigtemplates = \ - self.site.family.disambig(self.site.code) - if self.site._disambigtemplates is None: + default = set(self._site.family.disambig('_default')) + try: + distl = self.site.family.disambig(self.site.code, + fallback=False) + except KeyError: + distl = None + if distl is None: try: disambigpages = Page(self.site, "MediaWiki:Disambiguationspage") - self.site._disambigtemplates = [ - link.title(withNamespace=False) - for link in disambigpages.linkedPages() - if link.namespace() == 10 - ] + disambigs = set(link.title(withNamespace=False) + for link in disambigpages.linkedPages() + if link.namespace() == 10) + # add index article templates + if get_Index and \ + self.site.sitename() == 'wikipedia:en': + regex = re.compile('\(\((.+?)\)\)') + content = disambigpages.get() + for index in regex.findall(content): + disambigs.add(index) except pywikibot.NoPage: - self.site._disambigtemplates = ['Disambig'] - for t in self.templates(): - if t.title(withNamespace=False) in self.site._disambigtemplates: - self._isDisambig = True - break - else: - self._isDisambig = False + disambigs = set([self.site.mediawiki_message( + 'Disambiguationspage').split(':', 1)[1]]) + # add the default template(s) + self.site._disambigtemplates = disambigs | default + else: + # Normalize template capitalization + self.site._disambigtemplates = set( + t[:1].upper() + t[1:] for t in distl + ) + disambigInPage = self.site._disambigtemplates.intersection( + self.templates()) + self._isDisambig = self.namespace() != 10 and \ + len(disambigInPage) > 0 return self._isDisambig def getReferences(self, follow_redirects=True, withTemplateInclusion=True,

1 0

SVN: [8614] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8614 Author: xqt Date: 2010-10-06 15:24:15 +0000 (Wed, 06 Oct 2010) Log Message: ----------- obsolete disambig templates removed Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-10-06 15:08:59 UTC (rev 8613) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-10-06 15:24:15 UTC (rev 8614) @@ -732,151 +732,94 @@ } self.disambiguationTemplates = { - # set value to None, instead of a list, to retrieve names from - # the live wiki ([[MediaWiki:Disambiguationspage]] + # If no templates are given, retrieve names from the live wiki + # ([[MediaWiki:Disambiguationspage]]) '_default': [u'Disambig'], - 'af': None, - 'als': None, - 'an': None, - 'ang': [u'Disambig', u'Geodis'], - 'ar': None, + 'ang': [u'Geodis'], 'arc': [u'ܕ'], - 'arz': None, 'ast': [u'Dixebra'], 'av': [u'Неоднозначность'], 'ay': [u'Desambiguación'], 'az': [u'Dəqiqləşdirmə'], 'ba': [u'Күп мәғәнәлелек'], - 'bar': None, 'bcl': [u'Clarip'], - 'be': [u'Неадназначнасць', u'Disambig'], - 'be-x-old': [u'Неадназначнасьць', u'Disambig'], - 'bg': None, - 'bn': [u'দ্ব্যর্থতা নিরসন', u'Disambig'], - 'br': None, + 'be': [u'Неадназначнасць'], + 'be-x-old': [u'Неадназначнасьць'], + 'bn': [u'দ্ব্যর্থতা নিরসন'], 'bs': [u'Čvor'], - 'ca': None, - 'ceb': None, 'cdo': [u'Gì-ngiê'], - 'crh': [u'Çoq manalı', u'Disambig'], - 'cs': None, - 'cu': None, - 'cy': None, - 'da': None, - 'de': None, + 'crh': [u'Çoq manalı'], 'dsb': [u'Wěcejwóznamowosć'], - 'el': None, - 'en': None, - 'eo': None, - 'es': None, - 'et': None, - 'eu': None, 'ext': [u'Desambiguáncia'], - 'fa': None, - 'fi': None, 'fiu-vro': [u'Täpsüstüslehekülg'], 'fo': [u'Fleiri týdningar'], - 'fr': None, 'frp': [u'Homonimos'], - 'frr': None, - 'fur': [u'Disambiguazion', u'Disambig'], + 'fur': [u'Disambiguazion'], 'fy': [u'Tfs', u'Neibetsjuttings'], - 'ga': [u'Idirdhealú', u'Disambig'], - 'gan': [u'扤清楚', u'Disambig'], + 'ga': [u'Idirdhealú'], + 'gan': [u'扤清楚'], 'gd': [u'Soilleireachadh'], - 'gl': None, 'gv': [u'Reddaghey'], 'haw': [u'Huaʻōlelo puana like'], - 'he': None, - 'hi': [u'बहुविकल्पी शब्द', u'Disambig',], - 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', u'Nova razdvojba'], - 'hsb': [u'Wjacezmyslnosć', u'Disambig'], - 'ht': [u'Menm non', u'Disambig'], - 'hu': [u'Egyert', u'Disambig', u'Egyért', u'Egyért-redir'], - 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ', u'Disambig'], - 'ia': [u'Disambiguation', u'Disambig'], - 'id': None, - 'io': [u'Homonimo', u'Disambig'], - 'is': None, - 'it': None, - 'ja': None, - 'ka': None, + 'hi': [u'बहुविकल्पी शब्द'], + 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', + u'Nova razdvojba'], + 'hsb': [u'Wjacezmyslnosć'], + 'ht': [u'Menm non'], + 'hu': [u'Egyert', u'Egyért', u'Egyért-redir'], + 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ'], + 'ia': [u'Disambiguation'], + 'io': [u'Homonimo'], 'kab': [u'Asefham'], 'kg': [u'Bisongidila'], - 'kn': [u'ದ್ವಂದ್ವ ನಿವಾರಣೆ'], - 'ko': None, - 'krc': [u'Кёб магъаналы', u'Disambig'], - 'ksh': None, - 'ku': None, - 'kw': None, - 'la': None, - 'lb': [u'Homonymie', u'Disambig', u'Homonymie Ofkierzungen'], + 'krc': [u'Кёб магъаналы'], + 'lb': [u'Homonymie', u'Homonymie Ofkierzungen'], 'li': [u'Verdudeliking', u'Verdudelikingpazjena', u'Vp'], 'lmo': [u'Desambiguació', u'Dezambiguasiú', u'Desambiguazion', u'Desambiguassiú', u'Desambiguació'], - 'ln': None, - 'lt': None, - 'lv': [u'Nozīmju atdalīšana', u'Disambig'], - 'mk': [u'Појаснување', u'Disambig', u'Geodis'], - 'mn': [u'Салаа утгатай', u'Disambig'], - 'ms': [u'Nyahkekaburan', u'Disambig'], - 'mt': None, + 'lv': [u'Nozīmju atdalīšana'], + 'mk': [u'Појаснување', u'Geodis'], + 'mn': [u'Салаа утгатай'], + 'ms': [u'Nyahkekaburan'], 'mzn': [u'گجگجی بایری'], 'nap': [u'Disambigua'], - 'nds': [u'Mehrdüdig Begreep', 'Disambig'], - 'nds-nl': None, - 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', u'Dp cognomen'], - 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', u'Peikar', u'Disambig'], - 'no': [u'Peker', u'Etternavn', u'Disambig', u'Tobokstavsforkortelse', + 'nds': [u'Mehrdüdig Begreep'], + 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', + u'Dp cognomen'], + 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', + u'Peikar'], + 'no': [u'Peker', u'Etternavn' u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], - 'nv': None, 'nrm': [u'Page dé frouque'], - 'oc': [u'Omonimia', u'Disambig'], - 'pl': None, + 'oc': [u'Omonimia'], 'pms': [u'Gestion dij sinònim'], - 'pt': None, - 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], + 'qu': [u"Sut'ichana qillqa", u'SJM'], 'rmy': [u'Dudalipen'], - 'ro': [u'Dezambiguizare', u'Disambig', u'Hndis', u'Dez', u'Dezamb'], - 'ru': None, + 'ro': [u'Dezambiguizare', u'Hndis', u'Dez', u'Dezamb'], 'sc': [u'Disambigua'], - 'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'], - 'simple': None, - 'sh': None, - 'sk': [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'], - 'sl': None, - 'sq': [u'Kthjellim', u'Disambig'], - 'sr': None, + 'scn': [u'Disambigua', u'Sigla2', u'Sigla3'], + 'sk': [u'Rozlišovacia stránka', u'Disambiguation'], + 'sq': [u'Kthjellim'], 'srn': [u'Dp'], 'stq': [u'Begriepskläärenge'], - 'su': None, - 'sv': None, 'sw': [u'Maana'], - 'szl': [u'Disambig'], - 'ta': None, - 'te': None, - 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], - 'th': [u'แก้กำกวม', u'Disambig', u'คำกำกวม'], - 'tl': None, + 'tg': [u'Ибҳомзудоӣ', u'Рафъи ибҳом', u'Disambiguation'], + 'th': [u'แก้กำกวม', u'คำกำกวม'], 'to': [u'Fakaʻuhingakehe'], - 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı', - u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)', + 'tr': [u'Anlam ayrım', u'Anlam ayrımı', + u'Kişi adları (anlam ayrımı)', + u'Yerleşim yerleri (anlam ayrımı)', u'kısaltmalar (anlam ayrımı)'], - 'uk': None, 'vec': [u'Disanbigua', u'Disambigua'], - 'vi': None, 'vls': [u'Db', u'Dp', u'Dpintro'], - 'vo': None, - 'wa': None, - 'war': None, 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'dp', u'Deurverwiespagina'], - 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', u'Letter disambig'], - 'zh-classical': [u'Disambig', u'釋義', u'消歧義'], - 'zh-min-nan': None, - 'zh-yue': [u'搞清楚', u'Disambig'], + 'zh': [u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', + u'Letter disambig'], + 'zh-classical': [u'釋義', u'消歧義'], + 'zh-yue': [u'搞清楚'], } self.disambcatname = {

1 0

SVN: [8613] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8613 Author: xqt Date: 2010-10-06 15:08:59 +0000 (Wed, 06 Oct 2010) Log Message: ----------- None-Type entry in the family file is obsolete now. Template:Disambig is always assumed to be default regardless of its existence. If no templates are given in the family file and MediaWiki:Disambiguationspage doesn't exist, load the template from mediawiki_message. For en-wiki load index article templates if new parameter get_Index is True (bug #2968140) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-10-06 14:55:50 UTC (rev 8612) +++ trunk/pywikipedia/wikipedia.py 2010-10-06 15:08:59 UTC (rev 8613) @@ -1169,7 +1169,7 @@ """Return True if this is an image description page, False otherwise.""" return self.namespace() == 6 - def isDisambig(self): + def isDisambig(self, get_Index=True): """Return True if this is a disambiguation page, False otherwise. Relies on the presence of specific templates, identified in @@ -1177,31 +1177,53 @@ pages. By default, loads a list of template names from the Family file; - if the value in the Family file is None, looks for the list on - [[MediaWiki:Disambiguationspage]]. + if the value in the Family file is None no entry was made, looks for + the list on [[MediaWiki:Disambiguationspage]]. If this page does not + exist, take the mediawiki message. + If get_Index is True then also load the templates for index articles + which are given on en-wiki + + Template:Disambig is always assumed to be default, and will be + appended regardless of its existence. + """ if not hasattr(self, "_isDisambig"): if not hasattr(self._site, "_disambigtemplates"): - distl = self._site.family.disambig(self._site.lang) + default = set(self._site.family.disambig('_default')) + try: + distl = self._site.family.disambig(self._site.lang, + fallback=False) + except KeyError: + distl = None if distl is None: try: disambigpages = Page(self._site, "MediaWiki:Disambiguationspage") - self._site._disambigtemplates = set( - link.titleWithoutNamespace() - for link in disambigpages.linkedPages() - if link.namespace() == 10 - ) + disambigs = set(link.titleWithoutNamespace() + for link in disambigpages.linkedPages() + if link.namespace() == 10) + # add index article templates + if get_Index and \ + self._site.sitename() == 'wikipedia:en': + regex = re.compile('\(\((.+?)\)\)') + content = disambigpages.get() + for index in regex.findall(content): + disambigs.add(index) except NoPage: - self._site._disambigtemplates = set(['Disambig']) + disambigs = set([self._site.mediawiki_message( + 'Disambiguationspage').split(':', 1)[1]]) + # add the default template(s) + self._site._disambigtemplates = disambigs | default else: # Normalize template capitalization self._site._disambigtemplates = set( t[:1].upper() + t[1:] for t in distl ) - disambigInPage = self._site._disambigtemplates.intersection(self.templates()) - self._isDisambig = self.namespace() != 10 and len(disambigInPage) > 0 + disambigInPage = self._site._disambigtemplates.intersection( + self.templates()) + self._isDisambig = self.namespace() != 10 and \ + len(disambigInPage) > 0 return self._isDisambig def canBeEdited(self):

1 0

SVN: [8612] trunk/pywikipedia/families/wiktionary_family.py
by malafaya＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8612 Author: malafaya Date: 2010-10-06 14:55:50 +0000 (Wed, 06 Oct 2010) Log Message: ----------- interwiki sort order in da.wikt - alphabetic, as noted by wikt:da:User:Kinamand Modified Paths: -------------- trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-10-06 06:10:17 UTC (rev 8611) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-10-06 14:55:50 UTC (rev 8612) @@ -489,6 +489,7 @@ # after those, in code-alphabetical order. self.interwiki_putfirst = { + 'da': self.alphabetic, 'en': self.alphabetic, 'et': self.alphabetic, 'fi': self.alphabetic,

1 0

SVN: [8611] trunk/pywikipedia/nowcommons.py
by xqt＠svn.wikimedia.org 06 Oct '10

06 Oct '10

Revision: 8611 Author: xqt Date: 2010-10-06 06:10:17 +0000 (Wed, 06 Oct 2010) Log Message: ----------- refix for r8606 Modified Paths: -------------- trunk/pywikipedia/nowcommons.py Modified: trunk/pywikipedia/nowcommons.py =================================================================== --- trunk/pywikipedia/nowcommons.py 2010-10-05 20:53:50 UTC (rev 8610) +++ trunk/pywikipedia/nowcommons.py 2010-10-06 06:10:17 UTC (rev 8611) @@ -272,7 +272,7 @@ return filenameOnCommons # Function stolen from wikipedia.py and modified. Really needed? - def urlname(talk_page): + def urlname(self, talk_page): """The name of the page this Page refers to, in a form suitable for the URL of the page.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn October 2010