Pywikipedia-svn February 2010

pywikipedia-svn@lists.wikimedia.org

9 participants
71 discussions

SVN: [7913]
by xqt＠svn.wikimedia.org 08 Feb '10

08 Feb '10

Revision: 7913 Author: xqt Date: 2010-02-08 08:38:00 +0000 (Mon, 08 Feb 2010) Log Message: ----------- reorganize Added Paths: ----------- archive/ Removed Paths: ------------- tags/ tests/

1 0

SVN: [7912] branches/rewrite/pywikibot/textlib.py
by xqt＠svn.wikimedia.org 06 Feb '10

06 Feb '10

Revision: 7912 Author: xqt Date: 2010-02-05 17:40:58 +0000 (Fri, 05 Feb 2010) Log Message: ----------- actualize language dict for translate() from trunk Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2010-02-05 17:36:47 UTC (rev 7911) +++ branches/rewrite/pywikibot/textlib.py 2010-02-05 17:40:58 UTC (rev 7912) @@ -100,7 +100,7 @@ } # if we got a string, compile it as a regular expression - if type(old) is str or type(old) is unicode: + if type(old) in [str, unicode]: if caseInsensitive: old = re.compile(old, re.IGNORECASE | re.UNICODE) else: @@ -114,6 +114,9 @@ if exc not in exceptionRegexes: raise ValueError("Unknown tag type: " + exc) dontTouchRegexes.append(exceptionRegexes[exc]) + # handle alias + if exc == 'source': + dontTouchRegexes.append(re.compile(r'(?is)<syntaxhighlight .*?</syntaxhighlight>')) else: # assume it's a regular expression dontTouchRegexes.append(exc) @@ -275,7 +278,7 @@ instead. """ - if insite == None: + if insite is None: insite = pywikibot.getSite() result = {} # Ignore interwiki links within nowiki tags, includeonly tags, pre tags, @@ -312,7 +315,7 @@ interwiki links). """ - if site == None: + if site is None: site = pywikibot.getSite() if not site.validLanguageLinks(): return text @@ -358,7 +361,7 @@ """ # Find a marker that is not already in the text. marker = findmarker( oldtext, u'@@') - if site == None: + if site is None: site = pywikibot.getSite() separator = site.family.interwiki_text_separator cseparator = site.family.category_text_separator @@ -574,12 +577,13 @@ def replaceCategoryLinks(oldtext, new, site = None, addOnly = False): - """Replace the category links given in the wikitext given + """ + Replace the category links given in the wikitext given in oldtext by the new links given in new. 'new' should be a list of Category objects. - If addOnly is True, the old category won't be deleted andthe + If addOnly is True, the old category won't be deleted and the category(s) given will be added (and so they won't replace anything). """ @@ -614,7 +618,7 @@ firstafter = len(s2) else: firstafter += len(marker) - # Is there text in the 'after' part that means we should keep it + # Is there text in the 'after' part that means we should keep it # after? if "</noinclude>" in s2[firstafter:]: if separatorstripped: @@ -813,104 +817,139 @@ one with a translation, or '_default' as a last resort. """ - if code=='aa': + #Amharic + if code in ['aa', 'om']: return ['am'] - if code in ['fa','so']: + #Arab + if code in ['arc', 'arz']: return ['ar'] - if code=='ku': - return ['ar','tr'] - if code=='sk': - return ['cs'] - if code in ['bar','ksh','stq']: + if code == 'kab': + return ['ar', 'fr'] + #Bulgarian + if code in ['cu', 'mk']: + return ['bg', 'sr', 'sh'] + #Czech + if code in ['cs', 'sk']: + return ['cs', 'sk'] + #German + if code in ['bar', 'ksh', 'pdc']: return ['de'] - if code in ['als','lb']: - return ['de','fr'] - if code=='dsb': - return ['hsb','de'] - if code=='hsb': - return ['dsb','de'] - if code=='io': + if code in ['als', 'lb']: + return ['de', 'fr'] + if code == 'nds': + return ['nds-nl', 'de'] + if code in ['dsb', 'hsb']: + return ['hsb', 'dsb', 'de'] + if code == 'rm': + return ['de', 'it'] + if code == 'stq': + return ['fy', 'de'] + #Greek + if code == 'pnt': + return ['el'] + #Esperanto + if code in ['io', 'nov']: return ['eo'] - if code in ['an','ast','ay','ca','gn','nah','qu']: + #Spanish + if code in ['an', 'ast', 'ay', 'ca', 'ext', 'lad', 'nah', 'nv', 'qu']: return ['es'] - if code == ['cbk-zam']: - return ['es','tl'] - if code=='eu': - return ['es','fr'] - if code in ['glk','mzn']: - return ['fa','ar'] - if code=='gl': - return ['es','pt'] - if code=='lad': - return ['es','he'] - if code in ['br','ht','kab','ln','lo','nrm','wa']: + if code in ['gl', 'gn']: + return ['es', 'pt'] + if code == ['eu']: + return ['es', 'fr'] + if code in ['bcl', 'cbk-zam', 'ceb', 'ilo', 'pag', 'pam', 'tl', 'war']: + return ['es', 'tl'] + #Estonian + if code == 'fiu-vro': + return ['et'] + #Persian (Farsi) + if code in ['glk', 'mzn']: + return ['ar'] + #French + if code in ['bm', 'br', 'ht', 'kab', 'kg', 'ln', 'mg', 'nrm', 'oc', + 'pcd', 'rw', 'sg', 'ty', 'wa']: return ['fr'] - if code in ['ie','oc']: - return ['ie','oc','fr'] - if code in ['co','frp']: - return ['fr','it'] - if code=='yi': - return ['he','de'] - if code=='sa': + if code == 'co': + return ['fr', 'it'] + #Hindi + if code in ['bh', 'pi', 'sa']: return ['hi'] - if code in ['eml','lij','lmo','nap','pms','roa-tara','sc','scn','vec']: + if code in ['ne', 'new']: + return ['ne', 'new', 'hi'] + #Indonesian and Malay + if code in ['ace', 'bug', 'id', 'jv', 'ms', 'su']: + return ['id', 'ms', 'jv'] + if code == 'map-bms': + return ['jv', 'id', 'ms'] + #Inuit languages + if code in ['ik', 'iu']: + return ['iu', 'kl'] + if code == 'kl': + return ['iu', 'da', 'no'] + #Italian + if code in ['eml', 'fur', 'lij', 'lmo', 'nap', 'pms', 'roa-tara', 'sc', + 'scn', 'vec']: return ['it'] - if code=='rm': - return ['it','de','fr'] - if code in ['bat-smg','ltg']: + if code == 'frp': + return ['it', 'fr'] + #Lithuanian + if code in ['bat-smg', 'ltg']: return ['lt'] - if code=='ia': - return ['la','es','fr','it'] - if code=='nds': - return ['nds-nl','de'] - if code=='nds-nl': - return ['nds','nl'] - if code in ['fy','pap','vls','zea']: + #Dutch + if code in ['fy', 'li', 'pap', 'srn', 'vls', 'zea']: return ['nl'] - if code=='li': - return ['nl','de'] - if code=='csb': + if code == ['nds-nl']: + return ['nds', 'nl'] + #Polish + if code in ['csb', 'szl']: return ['pl'] - if code in ['fab','tet']: + #Portuguese + if code in ['fab', 'mwl', 'tet']: return ['pt'] - if code in ['mo','roa-rup']: + #Romanian + if code in ['mo', 'roa-rup']: return ['ro'] - if code in ['av','bxr','cv','hy','lbe','tg','udm','uk','xal']: + #Russian and Belarusian + if code in ['ab', 'av', 'ba', 'bxr', 'ce', 'cv', 'kk', 'ky', 'lbe', 'mdf', + 'mhr', 'myv', 'os', 'sah', 'tg', 'tt', 'udm', 'uk', 'xal']: return ['ru'] - if code in ['be','be-x-old']: - return ['be','be-x-old','ru'] - if code in ['ky','tt','uz']: - return ['kk','tr','ru'] - if code in ['az','diq','tk','ug']: - return ['tr'] - if code in ['ja','minnan','zh','zh-cn']: - return ['zh','zh-tw','zh-classical','zh-cn'] - if code in ['bo','cdo','hak','wuu','za','zh-cdo','zh-classical','zh-tw','zh-yue']: - return ['zh','zh-cn','zh-classical','zh-tw'] - if code=='da': - return ['nb','no'] - if code in ['is','no','nb','nn']: - return ['no','nb','nn','da','sv'] - if code=='sv': - return ['da','no','nb'] - if code=='se': - return ['no','nb','sv','nn','fi','da'] - if code in ['bug','id','jv','map-bms','ms','su']: - return ['id','ms','jv'] - if code in ['bs','hr','sh']: - return ['sh','hr','bs','sr'] - if code in ['mk','sr']: - return ['sh','sr','hr','bs'] - if code in ['ceb','pag','tl','war']: - return ['tl','es'] - if code=='bi': - return ['tpi'] - if code=='tpi': - return ['bi'] - if code == 'new': - return ['ne'] - if code == 'nov': - return ['io','eo'] + if code in ['be', 'be-x-old']: + return ['be', 'be-x-old', 'ru'] + if code == 'kaa': + return ['uz', 'ru'] + #Serbocroatian + if code in ['bs', 'hr', 'sh', 'sr']: + return ['sh', 'hr', 'bs', 'sr'] + #Turkish and Kurdish + if code in ['diq', 'ku']: + return ['ku', 'tr'] + if code == 'ckb': + return ['ku', 'ar'] + #Chinese + if code in ['minnan', 'zh', 'zh-classical', 'zh-min-nan', 'zh-tw', 'zh-hans', 'zh-hant']: + return ['zh', 'zh-tw', 'zh-cn', 'zh-classical'] + if code in ['cdo', 'gan', 'hak', 'ii', 'wuu', 'za', 'zh-cdo', 'zh-classical', + 'zh-cn', 'zh-yue']: + return ['zh', 'zh-cn', 'zh-tw', 'zh-classical'] + #Scandinavian languages + if code in ['da', 'sv']: + return ['da', 'no', 'nb', 'sv', 'nn'] + if code in ['fo', 'is']: + return ['da', 'no', 'nb', 'nn', 'sv'] + if code == 'nn': + return ['no', 'nb', 'sv', 'da'] + if code in ['nb', 'no']: + return ['no', 'nb', 'da', 'nn', 'sv'] + if code == 'se': + return ['sv', 'no', 'nb', 'nn', 'fi'] + #Other languages + if code in ['bi', 'tpi']: + return ['bi', 'tpi'] + if code == 'yi': + return ['he', 'de'] + if code in ['ia', 'ie']: + return ['ia', 'la', 'it', 'fr', 'es'] + #Default value return [] def translate(code, xdict): @@ -936,7 +975,9 @@ for alt in _altlang(code): if alt in xdict: return xdict[alt] - if "en" in xdict: + if '_default' in xdict: + return xdict['_default'] + elif 'en' in xdict: return xdict['en'] return xdict.values()[0]

1 0

SVN: [7911] trunk/pywikipedia
by xqt＠svn.wikimedia.org 06 Feb '10

06 Feb '10

Revision: 7911 Author: xqt Date: 2010-02-05 17:36:47 +0000 (Fri, 05 Feb 2010) Log Message: ----------- wikimedia_site.py writes self.languages_by_size direct into family file Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/maintenance/wikimedia_sites.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-02-05 09:03:56 UTC (rev 7910) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-02-05 17:36:47 UTC (rev 7911) @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import family __version__ = '$Id$' @@ -17,7 +17,7 @@ 'lt', 'bg', 'fa', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'th', 'gl', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', 'la', 'br', 'az', 'bs', 'lb', 'sh', 'is', 'mr', 'cy', 'sq', - 'lv', 'bpy', 'jv', 'tl', 'pms', 'be-x-old', 'bn', 'ta', 'oc', 'an', + 'lv', 'bpy', 'jv', 'tl', 'pms', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'io', 'be', 'sw', 'nds', 'scn', 'fy', 'su', 'qu', 'af', 'zh-yue', 'nap', 'ast', 'ku', 'gu', 'ur', 'bat-smg', 'ml', 'war', 'wa', 'cv', 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'lmo', 'kn', 'gd', 'uz', 'pam', @@ -26,13 +26,13 @@ 'fiu-vro', 'mn', 'nds-nl', 'vls', 'tk', 'sa', 'fo', 'am', 'nrm', 'dv', 'pag', 'rm', 'map-bms', 'wuu', 'ne', 'gv', 'bar', 'pnb', 'my', 'sco', 'diq', 'se', 'fur', 'lij', 'si', 'nov', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'km', 'lad', 'ug', 'sc', 'frp', 'mg', 'ang', + 'ilo', 'pi', 'zh-classical', 'ug', 'km', 'lad', 'sc', 'frp', 'mg', 'ang', 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'ckb', 'bo', 'pa', 'kv', - 'ie', 'to', 'hak', 'crh', 'myv', 'gn', 'stq', 'ln', 'nv', 'mhr', - 'jbo', 'arc', 'ace', 'ky', 'ext', 'wo', 'tpi', 'ty', 'cbk-zam', 'so', - 'eml', 'zea', 'srn', 'ay', 'pap', 'kab', 'ig', 'kg', 'ba', 'or', + 'ie', 'to', 'hak', 'crh', 'myv', 'gn', 'stq', 'ln', 'mhr', 'nv', + 'ace', 'jbo', 'arc', 'ky', 'ext', 'wo', 'tpi', 'ty', 'cbk-zam', 'so', + 'eml', 'zea', 'srn', 'ay', 'pap', 'ig', 'kab', 'kg', 'ba', 'or', 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'sm', 'ab', 'ce', 'xal', - 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'na', 'kl', 'pnt', 'iu', + 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'kl', 'na', 'pnt', 'iu', 'bm', 'pih', 'as', 'mwl', 'pcd', 'cdo', 'om', 'chr', 'ee', 'zu', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', 'dz', 'bxr', 'ch', 'cr', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'sg', 'st', 'ny', Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-02-05 09:03:56 UTC (rev 7910) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-02-05 17:36:47 UTC (rev 7911) @@ -15,9 +15,9 @@ 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'nn', 'et', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', - 'sr', 'ml', 'li', 'is', 'th', 'te', 'cy', 'af', 'da', 'az', + 'sr', 'ml', 'cy', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'sq', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', - 'ang', 'zh-min-nan', 'mr', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', + 'ang', 'zh-min-nan', 'mr', 'lb', 'gu', 'su', 'ur', 'wo', 'kn', 'ky', 'kk', 'am', 'co', ] Modified: trunk/pywikipedia/maintenance/wikimedia_sites.py =================================================================== --- trunk/pywikipedia/maintenance/wikimedia_sites.py 2010-02-05 09:03:56 UTC (rev 7910) +++ trunk/pywikipedia/maintenance/wikimedia_sites.py 2010-02-05 17:36:47 UTC (rev 7911) @@ -1,10 +1,18 @@ -# This script checks the language list of each Wikimedia multiple-language site -# against the language lists +""" +This script checks the language list of each Wikimedia multiple-language site +against the language lists +""" +# +# (C) Pywikipedia bot team, 2008-2010 +# +# Distributed under the terms of the MIT license. +# import sys, re sys.path.append('..') import wikipedia +import codecs families = ['wikipedia', 'wiktionary', 'wikiquote', 'wikisource', 'wikibooks', 'wikinews', 'wikiversity'] familiesDict = { @@ -14,48 +22,64 @@ 'wikisource': 'wikisources_wiki.php', 'wikibooks': 'wikibooks_wiki.php', 'wikinews': 'wikinews_wiki.php', - 'wikiversity': 'wikiversity_wiki.php', + 'wikiversity':'wikiversity_wiki.php', } exceptions = ['www'] -for family in families: - wikipedia.output('Checking family %s:' % family) +def update_family(): + for family in families: + wikipedia.output('Checking family %s:' % family) - original = wikipedia.Family(family).languages_by_size - obsolete = wikipedia.Family(family).obsolete + original = wikipedia.Family(family).languages_by_size + obsolete = wikipedia.Family(family).obsolete - url = 'http://s23.org/wikistats/%s' % familiesDict[family] - uo = wikipedia.MyURLopener - f = uo.open(url) - text = f.read() + url = 'http://s23.org/wikistats/%s' % familiesDict[family] + uo = wikipedia.MyURLopener + f = uo.open(url) + text = f.read() - if family == 'wikipedia': - p = re.compile(r"\[\[:([a-z\-]{2,}):\|\1\]\].*?'''([0-9,]{1,})'''</span>\]", re.DOTALL) - else: - p = re.compile(r"\[http://([a-z\-]{2,}).%s.org/wiki/ \1].*?'''([0-9,]{1,})'''\]" % family, re.DOTALL) + if family == 'wikipedia': + p = re.compile(r"\[\[:([a-z\-]{2,}):\|\1\]\].*?'''([0-9,]{1,})'''</span>\]", re.DOTALL) + else: + p = re.compile(r"\[http://([a-z\-]{2,}).%s.org/wiki/ \1].*?'''([0-9,]{1,})'''\]" % family, re.DOTALL) - new = [] - for lang, cnt in p.findall(text): - if lang in obsolete or lang in exceptions: - # Ignore this language - continue - new.append(lang) - if original == new: - wikipedia.output(u'The lists match!') - else: - wikipedia.output(u"The lists don't match, the new list is:") - wikipedia.output(u' self.languages_by_size = [') - line = ' ' - index = 0 - for lang in new: - index += 1 - if index > 1: - line += u' ' - line += u"'%s'," % lang - if index == 10: - wikipedia.output(u'%s' % line) - line = ' ' - index = 0 - if index > 0: - wikipedia.output(u'%s' % line) - wikipedia.output(u' ]') + new = [] + for lang, cnt in p.findall(text): + if lang in obsolete or lang in exceptions: + # Ignore this language + continue + new.append(lang) + if original == new: + wikipedia.output(u'The lists match!') + else: + wikipedia.output(u"The lists don't match, the new list is:") + text = u' self.languages_by_size = [\r\n' + line = ' ' + index = 0 + for lang in new: + index += 1 + if index > 1: + line += u' ' + line += u"'%s'," % lang + if index == 10: + text += u'%s\r\n' % line + line = ' ' + index = 0 + if index > 0: + text += u'%s\r\n' % line + text += u' ]' + wikipedia.output(text) + family_file_name = '../families/%s_family.py' % family + family_file = codecs.open(family_file_name, 'r', 'utf8') + old_text = family_text = family_file.read() + old = re.findall(ur'(?msu)^ {8}self.languages_by_size.+?\]', family_text)[0] + family_text = family_text.replace(old, text) + family_file = codecs.open(family_file_name, 'w', 'utf8') + family_file.write(family_text) + family_file.close() + +if __name__ == '__main__': + try: + update_family() + finally: + wikipedia.stopme()

1 0

SVN: [7910] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 05 Feb '10

05 Feb '10

Revision: 7910 Author: xqt Date: 2010-02-05 09:03:56 +0000 (Fri, 05 Feb 2010) Log Message: ----------- * removeDeprecatedTemplates: (restored from older version) but it also replaces old templates with a new one, keeping its parameter if necessary * fixHtml: replace header tags where only spaces are in the same line with mw-syntax * exception handling for EditConflict * additional choice for quitting the script Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-02-05 06:42:52 UTC (rev 7909) +++ trunk/pywikipedia/cosmetic_changes.py 2010-02-05 09:03:56 UTC (rev 7910) @@ -214,6 +214,37 @@ 'zh' : ([u'documentation', u'doc'], u'/doc'), } +# Template which should be replaced or removed. +# Use a list with two entries. The first entry will be replaced by the second. +# Examples: +# For removing {{Foo}}, the list must be: +# (u'Foo', None), +# +# The following also works: +# (u'Foo', ''), +# +# For replacing {{Foo}} with {{Bar}} the list must be: +# (u'Foo', u'Bar'), +# +# This also removes all template parameters of {{Foo}} +# For replacing {{Foo}} with {{Bar}} but keep the template +# parameters in its original order, please use: +# (u'Foo', u'Bar\g<parameters>), + +deprecatedTemplates = { + 'wikipedia': { + 'de': [ + (u'Stub', None), + (u'Belege', u'Belege fehlen\g<parameters>'), + (u'Quelle', u'Belege fehlen\g<parameters>'), + (u'Quellen', u'Belege fehlen\g<parameters>'), + ], + 'pdc':[ + (u'Schkiss', None), + ], + } +} + class CosmeticChangesToolkit: def __init__(self, site, debug=False, redirect=False, namespace=None, pageTitle=None): self.site = site @@ -235,6 +266,7 @@ text = self.cleanUpSectionHeaders(text) text = self.putSpacesInLists(text) text = self.translateAndCapitalizeNamespaces(text) + text = self.replaceDeprecatedTemplates(text) text = self.resolveHtmlEntities(text) text = self.validXhtml(text) text = self.removeUselessSpaces(text) @@ -570,6 +602,21 @@ text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', exceptions) return text + def replaceDeprecatedTemplates(self, text): + exceptions = ['comment', 'math', 'nowiki', 'pre'] + if self.site.family.name in deprecatedTemplates and self.site.lang in deprecatedTemplates[self.site.family.name]: + for template in deprecatedTemplates[self.site.family.name][self.site.lang]: + old = template[0] + new = template[1] + if new == None: + new = '' + else: + new = '{{'+new+'}}' + if not self.site.nocapitalize: + old = '[' + old[0].upper() + old[0].lower() + ']' + old[1:] + text = pywikibot.replaceExcept(text, r'\{\{([mM][sS][gG]:)?' + old + '(?P<parameters>\|[^}]+|)}}', new, exceptions) + return text + #from fixes.py def fixSyntaxSave(self, text): exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] @@ -600,6 +647,12 @@ # horizontal line with attributes; can't be done with wiki syntax # so we only make it XHTML compliant text = pywikibot.replaceExcept(text, r'(?i)<hr ([^>/]+?)>', r'<hr \1 />', exceptions) + # a header where only spaces are in the same line + for level in range(1, 7): + equals = '\\1%s \\2 %s\\3' % ("="*level, "="*level) + text = pywikibot.replaceExcept(text, + r'(?i)([\r\n]) *<h%d> *([^<]+?) *</h%d> *([\r\n])'%(level, level), + r'%s'%equals, exceptions) #remove empty <ref/>-tag text = pywikibot.replaceExcept(text, r'(?i)<ref\s*/>', r'', exceptions) # TODO: maybe we can make the bot replace <p> tags with \r\n's. @@ -631,6 +684,7 @@ self.generator = generator self.acceptall = acceptall self.comment = comment + self.done = False def treat(self, page): try: @@ -641,9 +695,13 @@ changedText = ccToolkit.change(page.get()) if changedText.strip() != page.get().strip(): if not self.acceptall: - choice = pywikibot.inputChoice(u'Do you want to accept these changes?', ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') + choice = pywikibot.inputChoice(u'Do you want to accept these changes?', + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'a': self.acceptall = True + elif choice == 'q': + self.done = True + return if self.acceptall or choice == 'y': page.put(changedText, comment=self.comment) else: @@ -654,10 +712,13 @@ pywikibot.output("Page %s is a redirect; skipping." % page.aslink()) except pywikibot.LockedPage: pywikibot.output("Page %s is locked?!" % page.aslink()) + except pywikibot.EditConflict: + pywikibot.output("An edit conflict has occured at %s." % page.aslink()) def run(self): try: for page in self.generator: + if self.done: break self.treat(page) except KeyboardInterrupt: pywikibot.output('\nQuitting program...')

1 0

SVN: [7909] trunk/pywikipedia
by xqt＠svn.wikimedia.org 05 Feb '10

05 Feb '10

Revision: 7909 Author: xqt Date: 2010-02-05 06:42:52 +0000 (Fri, 05 Feb 2010) Log Message: ----------- translations for hu-wiki, update family files Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wiktionary_family.py trunk/pywikipedia/selflink.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-02-04 07:12:46 UTC (rev 7908) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-02-05 06:42:52 UTC (rev 7909) @@ -16,7 +16,7 @@ 'ca', 'tr', 'th', 'mk', 'sr', 'tl', 'fa', 'id', 'is', 'ar', 'no', 'ta', 'ka', 'ko', 'simple', 'gl', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'ur', - 'uk', 'oc', 'ml', 'ms', 'eu', 'az', 'fy', 'hi', 'ie', 'tg', + 'uk', 'oc', 'ml', 'ms', 'az', 'eu', 'fy', 'hi', 'ie', 'tg', 'hy', 'bn', 'af', 'te', 'bs', 'pa', 'ky', 'sa', 'be', 'ast', 'zh-min-nan', 'cy', 'tt', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', 'als', 'su', 'uz', 'vo', 'na', 'mn', 'kn', 'kk', 'nds', 'za', Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-02-04 07:12:46 UTC (rev 7908) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-02-05 06:42:52 UTC (rev 7909) @@ -24,15 +24,15 @@ 'hy', 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'kk', 'hsb', 'sah', 'li', 'als', 'co', 'roa-rup', 'tt', 'ia', 'yo', 'bcl', 'os', 'gan', 'arz', 'fiu-vro', 'mn', 'nds-nl', 'vls', 'tk', 'sa', 'fo', 'am', 'nrm', 'dv', - 'pag', 'rm', 'map-bms', 'wuu', 'ne', 'gv', 'bar', 'my', 'pnb', 'sco', + 'pag', 'rm', 'map-bms', 'wuu', 'ne', 'gv', 'bar', 'pnb', 'my', 'sco', 'diq', 'se', 'fur', 'lij', 'si', 'nov', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'sc', 'frp', 'mg', 'ang', + 'ilo', 'pi', 'zh-classical', 'km', 'lad', 'ug', 'sc', 'frp', 'mg', 'ang', 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'ckb', 'bo', 'pa', 'kv', 'ie', 'to', 'hak', 'crh', 'myv', 'gn', 'stq', 'ln', 'nv', 'mhr', 'jbo', 'arc', 'ace', 'ky', 'ext', 'wo', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', 'zea', 'srn', 'ay', 'pap', 'kab', 'ig', 'kg', 'ba', 'or', 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'sm', 'ab', 'ce', 'xal', - 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'na', 'pnt', 'kl', 'iu', + 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'na', 'kl', 'pnt', 'iu', 'bm', 'pih', 'as', 'mwl', 'pcd', 'cdo', 'om', 'chr', 'ee', 'zu', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', 'dz', 'bxr', 'ch', 'cr', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'sg', 'st', 'ny', @@ -620,6 +620,9 @@ 'fr': (u'Redirection de catégorie',), 'hi': (u'श्रेणीअनुप्रेषित', u'Categoryredirect',), + 'hu': (u'kat-redir', + u'katredir', + u'kat-redirekt',), 'id': (u'Alih kategori', u'Alihkategori',), # 'it' has removed its template Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-02-04 07:12:46 UTC (rev 7908) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-02-05 06:42:52 UTC (rev 7909) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', - 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'eo', 'simple', 'hy', + 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'nn', 'et', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'ml', 'li', 'is', 'th', 'te', 'cy', 'af', 'da', 'az', 'sq', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-02-04 07:12:46 UTC (rev 7908) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-02-05 06:42:52 UTC (rev 7909) @@ -14,7 +14,7 @@ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', 'fi', 'hu', 'no', 'pt', 'ta', 'it', 'de', 'sv', 'ko', 'nl', 'lo', 'ja', 'ku', 'ar', 'kn', 'es', 'ro', 'et', 'id', 'te', - 'gl', 'bg', 'uk', 'ca', 'ml', 'vo', 'li', 'is', 'fa', 'sr', + 'gl', 'bg', 'ml', 'uk', 'ca', 'vo', 'li', 'is', 'fa', 'sr', 'af', 'cs', 'scn', 'sw', 'th', 'fy', 'simple', 'br', 'oc', 'he', 'sl', 'hy', 'sq', 'tt', 'hr', 'la', 'zh-min-nan', 'da', 'ast', 'tk', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2010-02-04 07:12:46 UTC (rev 7908) +++ trunk/pywikipedia/selflink.py 2010-02-05 06:42:52 UTC (rev 7909) @@ -46,6 +46,7 @@ 'es':u'Bot: Eliminando enlaces al mismo artículo', 'fr':u'Robot: Enlève autoliens', 'he':u'בוט: מסיר קישורים של הדף לעצמו', + 'hu':u'Bot: Önmagukra mutató hivatkozások eltávolítása', 'ja':u'ロボットによる自己リンクの解除', 'ksh':u'Bot: Ene Lengk vun de Sigg op sesch sellver, erus jenumme.', 'nl':u'Bot: verwijzingen naar pagina zelf verwijderd',

1 0

SVN: [7908] trunk/pywikipedia/capitalize_redirects.py
by xqt＠svn.wikimedia.org 04 Feb '10

04 Feb '10

Revision: 7908 Author: xqt Date: 2010-02-04 07:12:46 +0000 (Thu, 04 Feb 2010) Log Message: ----------- * Use pagegenerators for getting pages to processed * check whether source page exists * use localized translation for #REDIRECT Modified Paths: -------------- trunk/pywikipedia/capitalize_redirects.py Modified: trunk/pywikipedia/capitalize_redirects.py =================================================================== --- trunk/pywikipedia/capitalize_redirects.py 2010-02-03 13:13:43 UTC (rev 7907) +++ trunk/pywikipedia/capitalize_redirects.py 2010-02-04 07:12:46 UTC (rev 7908) @@ -7,48 +7,33 @@ Command-line arguments: - -file Work on all pages listed in a text file. - Argument can also be given as "-file:filename". +&params; - -cat Work on all pages which are in a specific category. - Argument can also be given as "-cat:categoryname". +-always Don't prompt to make changes, just do them. - -ref Work on all pages that link to a certain page. - Argument can also be given as "-ref:referredpagetitle". +-titlecase creates a titlecased redirect version of a given page + where all words of the title start with an uppercase + character and the remaining characters are lowercase. - -links Work on all pages that are linked from a certain page. - Argument can also be given as "-link:linkingpagetitle". - - -start Work on all pages on the home wiki, starting at the named - page. - - -page Work on a single page. - - -namespace Run over especific namespace. - Argument can also be given as "-namespace:100" or - "-namespace:Image". - - -always Don't prompt to make changes, just do them. - - -titlecase creates a titlecased redirect version of a given page - where all words of the title start with an uppercase - character and the remaining characters are lowercase - Example: "python capitalize_redirects.py -start:B -always" ''' # # (C) Yrithinnd -# (C) Pywikipedia bot team, 2007-2009 +# (C) Pywikipedia bot team, 2007-2010 # # Class licensed under terms of the MIT license # __version__ = '$Id$' # -import time, sys +import time, sys, re import wikipedia as pywikibot import pagegenerators, catlib +docuReplacements = { + '&params;': pagegenerators.parameterHelp +} + msg = { 'ar': u'روبوت: إنشاء تحويلة إلى [[%s]]', 'cs': u'Robot vytvořil přesměrování na [[%s]]', @@ -70,124 +55,65 @@ self.acceptall = acceptall self.titlecase = titlecase self.site = pywikibot.getSite() + self.done = False def run(self): for page in self.generator: - if page.isRedirectPage(): - page = page.getRedirectTarget() - page_t = page.title() - # Show the title of the page we're working on. - # Highlight the title in purple. - pywikibot.output(u"\n>>> \03{lightpurple}%s\03{default} <<<" - % page_t) - if self.titlecase: - page_cap = pywikibot.Page(self.site, page_t.title()) - else: - page_cap = pywikibot.Page(self.site, page_t.capitalize()) - if not page_cap.exists(): - pywikibot.output(u'[[%s]] doesn\'t exist' % page_cap.title()) - if not self.acceptall: - choice = pywikibot.inputChoice( - u'Do you want to create a redirect?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') - if choice == 'a': - self.acceptall = True - elif choice == 'q': - break - if self.acceptall or choice == 'y': - comment = pywikibot.translate(self.site, msg) % page_t - try: - page_cap.put(u"#REDIRECT [[%s]]" % page_t, comment) - print - except: - pywikibot.output(u"An error occurred, skipping...") - continue - else: - pywikibot.output(u'%s already exists, skipping...\n' - % page_t.title()) + if self.done: break + if page.exists(): + self.treat(page) + def treat(self, page): + if page.isRedirectPage(): + page = page.getRedirectTarget() + page_t = page.title() + # Show the title of the page we're working on. + # Highlight the title in purple. + pywikibot.output(u"\n>>> \03{lightpurple}%s\03{default} <<<" + % page_t) + if self.titlecase: + page_cap = pywikibot.Page(self.site, page_t.title()) + else: + page_cap = pywikibot.Page(self.site, page_t.capitalize()) + if page_cap.exists(): + pywikibot.output(u'%s already exists, skipping...\n' + % page_cap.aslink()) + else: + pywikibot.output(u'[[%s]] doesn\'t exist' % page_cap.title()) + if not self.acceptall: + choice = pywikibot.inputChoice( + u'Do you want to create a redirect?', + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + if choice == 'a': + self.acceptall = True + elif choice == 'q': + self.done = True + if self.acceptall or choice == 'y': + comment = pywikibot.translate(self.site, msg) % page_t + try: + page_cap.put(u"#%s [[%s]]" % (self.site.redirect(True), page_t), comment) + except: + pywikibot.output(u"An error occurred, skipping...") + def main(): - gen = None - source = None - textfilename = None - categoryname = None - pageNames = [] - referredPageName = None + genFactory = pagegenerators.GeneratorFactory() acceptall = False - namespaces = [] - startpage = None titlecase = False for arg in pywikibot.handleArgs(): - if arg.startswith('-file'): - if len(arg) == 5: - textfilename = pywikibot.input(u'Please enter the filename:') - else: - textfilename = arg[6:] - source = 'textfile' - elif arg.startswith('-cat'): - if len(arg) == 4: - categoryname = pywikibot.input( - u'Please enter the category name:') - else: - categoryname = arg[5:] - source = 'category' - elif arg.startswith('-page'): - if len(arg) == 5: - pageNames.append(pywikibot.input( - u'Which page do you want to change?')) - else: - pageNames.append(arg[6:]) - source = 'singlepage' - elif arg.startswith('-ref'): - if len(arg) == 4: - referredPageName = pywikibot.input( - u'Links to which page should be processed?') - else: - referredPageName = arg[5:] - source = 'ref' - elif arg.startswith('-start'): - if len(arg) == 6: - firstPageTitle = pywikibot.input( - u'Which page do you want to change?') - else: - firstPageTitle = arg[7:] - source = 'allpages' - elif arg == '-always': + if arg == '-always': acceptall = True elif arg == '-titlecase': titlecase = True - elif arg.startswith('-namespace:'): - try: - namespaces.append(int(arg[11:])) - except ValueError: - namespaces.append(arg[11:]) + elif genFactory.handleArg(arg): + pass else: - commandline_replacements.append(arg) + pywikibot.showHelp(u'capitalize_redirects') + return - if source == 'textfile': - gen = pagegenerators.TextfilePageGenerator(textfilename) - elif source == 'category': - cat = catlib.Category(pywikibot.getSite(), categoryname) - gen = pagegenerators.CategorizedPageGenerator(cat) - elif source == 'singlepage': - pages = [pywikibot.Page(pywikibot.getSite(), pageName) - for pageName in pageNames] - gen = iter(pages) - elif source == 'allpages': - namespace = pywikibot.Page(pywikibot.getSite(), - firstPageTitle).namespace() - gen = pagegenerators.AllpagesPageGenerator(firstPageTitle, namespace) - elif source == 'ref': - referredPage = pywikibot.Page(pywikibot.getSite(), referredPageName) - gen = pagegenerators.ReferringPageGenerator(referredPage) - elif source == None or len(commandline_replacements) not in [0, 2]: - pywikibot.showHelp(u'capitalize_redirects') - return - if namespaces != []: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) - preloadingGen = pagegenerators.PreloadingGenerator(gen, pageNumber = 20) - bot = CapitalizeBot(preloadingGen, acceptall, titlecase) + gen = genFactory.getCombinedGenerator() + preloadingGen = pagegenerators.PreloadingGenerator(gen) + bot = CapitalizeBot(preloadingGen, acceptall, titlecase, standard) bot.run() if __name__ == "__main__":

1 0

SVN: [7907] trunk/pywikipedia/fixing_redirects.py
by xqt＠svn.wikimedia.org 03 Feb '10

03 Feb '10

Revision: 7907 Author: xqt Date: 2010-02-03 13:13:43 +0000 (Wed, 03 Feb 2010) Log Message: ----------- * Skip workon() if page does not exist * remove preleading colons Modified Paths: -------------- trunk/pywikipedia/fixing_redirects.py Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2010-02-03 10:54:02 UTC (rev 7906) +++ trunk/pywikipedia/fixing_redirects.py 2010-02-03 13:13:43 UTC (rev 7907) @@ -122,10 +122,18 @@ continue replaceit = choice in "rR" + # remove preleading ":" + if link_text[0]==':': + link_text = link_text[1:] if link_text[0].isupper(): new_page_title = targetPage.title() else: new_page_title = targetPage.title()[0].lower() + targetPage.title()[1:] + + # remove preleading ":" + if new_page_title[0]==':': + new_page_title = new_page_title[1:] + if replaceit and trailing_chars: newlink = "[[%s%s]]%s" % (new_page_title, section, trailing_chars) elif replaceit or (new_page_title == link_text and not section): @@ -146,13 +154,17 @@ try: text = page.get() except wikipedia.IsRedirectPage: + wikipedia.output(u'%s is a redirect page. Skipping' % page.aslink()) return + except wikipedia.NoPage: + wikipedia.output(u'%s does not exist. Skipping' % page.aslink()) + return wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) links = page.linkedPages() if len(links) > 0: wikipedia.getall(mysite,links) else: - wikipedia.output('No any links.') + wikipedia.output('Nothing left to do.') return for page2 in links:

1 0

SVN: [7906] trunk/pywikipedia/solve_disambiguation.py
by xqt＠svn.wikimedia.org 03 Feb '10

03 Feb '10

Revision: 7906 Author: xqt Date: 2010-02-03 10:54:02 +0000 (Wed, 03 Feb 2010) Log Message: ----------- additional exceptions Modified Paths: -------------- trunk/pywikipedia/solve_disambiguation.py Modified: trunk/pywikipedia/solve_disambiguation.py =================================================================== --- trunk/pywikipedia/solve_disambiguation.py 2010-02-03 10:43:48 UTC (rev 7905) +++ trunk/pywikipedia/solve_disambiguation.py 2010-02-03 10:54:02 UTC (rev 7906) @@ -247,18 +247,18 @@ u'Wikipedia:Links til sider med flertydige titler' ], 'de': [ - u'.+/Archiv.*', u'.+/[aA]rchiv.*', u'.+/Baustelle.*', u'.+/Spielwiese', u'.+/[tT]est.*', + u'.*Diskussion:.+', u'Benutzer:.+/[Ll]og.*', u'Benutzer:C.Löser/.+', u'Benutzer:Katharina/Begriffsklärungen', u'Benutzer:Kirschblut/.+buchstabenkürzel', u'Benutzer:Mathias Schindler/.+', u'Benutzer:Noisper/Dingliste/[A-Z]', - u'Benutzer:Professor Einstein.*' + u'Benutzer:Professor Einstein.*', u'Benutzer:Sebbot/.+', u'Benutzer:SirJective/.+', u'Benutzer:Srbauer.*', @@ -281,12 +281,13 @@ u'Wikipedia:ISBN-Suche', u'Wikipedia:Liste mathematischer Themen/BKS', u'Wikipedia:Liste mathematischer Themen/Redirects', + u'Wikipedia:Meinungsbilder/.+', u'Wikipedia:Löschkandidaten/.+', u'Wikipedia:WikiProjekt Altertumswissenschaft/.+', u'Wikipedia:WikiProjekt Verwaiste Seiten/Begriffsklärungen', u'Wikipedia:Qualitätssicherung/.+', ], - 'en': [ + 'en': [ u'Wikipedia:Links to disambiguating pages', u'Wikipedia:Disambiguation pages with links', u'Wikipedia:Multiple-place names $[A-Z]$',

1 0

SVN: [7905] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 03 Feb '10

03 Feb '10

Revision: 7905 Author: xqt Date: 2010-02-03 10:43:48 +0000 (Wed, 03 Feb 2010) Log Message: ----------- update family file for tt-wiki Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-02-03 05:10:10 UTC (rev 7904) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-02-03 10:43:48 UTC (rev 7905) @@ -140,6 +140,7 @@ 'th': u'วิกิพีเดีย', 'tk': u'Wikipediýa', 'tr': u'Vikipedi', + 'tt': u'Википедия', 'uk': u'Вікіпедія', 'ur': u'منصوبہ', 'uz': u'Vikipediya', @@ -317,7 +318,7 @@ 'tk': u'Wikipediýa çekişme', 'tl': u'Usapang Wikipedia', 'tr': u'Vikipedi tartışma', - 'tt': [u'Wikipedia бәхәсе', u'Wikipedia bäxäse'], + 'tt': [u'Википедия бәхәсе', u'Wikipedia бәхәсе', u'Wikipedia bäxäse'], 'ty': u'Discussion Wikipedia', 'udm': u'Wikipedia сярысь вераськон', 'uk': u'Обговорення Вікіпедії',

1 0

SVN: [7904] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 03 Feb '10

03 Feb '10

Revision: 7904 Author: xqt Date: 2010-02-03 05:10:10 +0000 (Wed, 03 Feb 2010) Log Message: ----------- New sorting order for sr-wiki, update family files Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-02-02 18:36:24 UTC (rev 7903) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-02-03 05:10:10 UTC (rev 7904) @@ -13,13 +13,13 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'hu', 'pt', 'ja', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'zh', 'sv', 'da', - 'ca', 'mk', 'tr', 'th', 'sr', 'tl', 'fa', 'id', 'is', 'ar', - 'ta', 'no', 'ka', 'ko', 'simple', 'gl', 'eo', 'lt', 'bg', 'ro', + 'ca', 'tr', 'th', 'mk', 'sr', 'tl', 'fa', 'id', 'is', 'ar', + 'no', 'ta', 'ka', 'ko', 'simple', 'gl', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'ur', - 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'hi', 'ie', 'az', 'tg', + 'uk', 'oc', 'ml', 'ms', 'eu', 'az', 'fy', 'hi', 'ie', 'tg', 'hy', 'bn', 'af', 'te', 'bs', 'pa', 'ky', 'sa', 'be', 'ast', 'zh-min-nan', 'cy', 'tt', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', - 'als', 'su', 'vo', 'uz', 'na', 'mn', 'kn', 'kk', 'nds', 'za', + 'als', 'su', 'uz', 'vo', 'na', 'mn', 'kn', 'kk', 'nds', 'za', 'zu', 'my', ] Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-02-02 18:36:24 UTC (rev 7903) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-02-03 05:10:10 UTC (rev 7904) @@ -19,21 +19,21 @@ 'la', 'br', 'az', 'bs', 'lb', 'sh', 'is', 'mr', 'cy', 'sq', 'lv', 'bpy', 'jv', 'tl', 'pms', 'be-x-old', 'bn', 'ta', 'oc', 'an', 'io', 'be', 'sw', 'nds', 'scn', 'fy', 'su', 'qu', 'af', 'zh-yue', - 'nap', 'ast', 'ku', 'ur', 'gu', 'bat-smg', 'ml', 'war', 'wa', 'cv', - 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'kn', 'gd', 'lmo', 'uz', 'pam', + 'nap', 'ast', 'ku', 'gu', 'ur', 'bat-smg', 'ml', 'war', 'wa', 'cv', + 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'lmo', 'kn', 'gd', 'uz', 'pam', 'hy', 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'kk', 'hsb', 'sah', 'li', 'als', 'co', 'roa-rup', 'tt', 'ia', 'yo', 'bcl', 'os', 'gan', 'arz', 'fiu-vro', 'mn', 'nds-nl', 'vls', 'tk', 'sa', 'fo', 'am', 'nrm', 'dv', - 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'diq', - 'se', 'fur', 'pnb', 'lij', 'si', 'nov', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'km', 'lad', 'ug', 'sc', 'frp', 'mg', 'ang', - 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'bo', 'ckb', 'pa', 'kv', + 'pag', 'rm', 'map-bms', 'wuu', 'ne', 'gv', 'bar', 'my', 'pnb', 'sco', + 'diq', 'se', 'fur', 'lij', 'si', 'nov', 'mt', 'bh', 'mzn', 'csb', + 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'sc', 'frp', 'mg', 'ang', + 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'ckb', 'bo', 'pa', 'kv', 'ie', 'to', 'hak', 'crh', 'myv', 'gn', 'stq', 'ln', 'nv', 'mhr', - 'jbo', 'arc', 'ext', 'wo', 'ky', 'ace', 'tpi', 'ty', 'cbk-zam', 'so', + 'jbo', 'arc', 'ace', 'ky', 'ext', 'wo', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', 'zea', 'srn', 'ay', 'pap', 'kab', 'ig', 'kg', 'ba', 'or', - 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ab', 'ce', 'sm', 'xal', + 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'sm', 'ab', 'ce', 'xal', 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'na', 'pnt', 'kl', 'iu', - 'bm', 'pih', 'as', 'pcd', 'mwl', 'cdo', 'om', 'chr', 'ee', 'zu', + 'bm', 'pih', 'as', 'mwl', 'pcd', 'cdo', 'om', 'chr', 'ee', 'zu', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', 'dz', 'bxr', 'ch', 'cr', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'sg', 'st', 'ny', 'tw', 'chy', 'ak', 'fj', 'sn', 'ff', 'lbe', 'lg', 'tum', 'rn', @@ -962,6 +962,37 @@ 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', 'zh-tw', 'zh-cn' ] + + self.alphabetic_latin = [ + 'ace', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', + 'roa-rup', 'frp', 'arz', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'id', + 'ms', 'bg', 'bm', 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', + 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bn', 'bo', 'bar', 'bs', 'bpy', + 'br', 'bug', 'bxr', 'ca', 'ceb', 'ch', 'cbk-zam', 'sn', 'tum', 'ny', + 'cho', 'chr', 'co', 'cy', 'cv', 'cs', 'da', 'dk', 'pdc', 'de', 'nv', + 'dsb', 'na', 'dv', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', + 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', + 'ga', 'gv', 'sm', 'gd', 'gl', 'gan', 'ki', 'glk', 'got', 'gu', 'ha', + 'hak', 'xal', 'haw', 'he', 'hi', 'ho', 'hsb', 'hr', 'hy', 'io', + 'ig', 'ii', 'ilo', 'ia', 'ie', 'iu', 'ik', 'os', 'xh', 'zu', 'is', + 'it', 'ja', 'ka', 'kl', 'kr', 'pam', 'csb', 'kk', 'kw', 'rw', 'ky', + 'rn', 'sw', 'km', 'kn', 'ko', 'kv', 'kg', 'ht', 'ks', 'ku', 'kj', + 'lad', 'lbe', 'la', 'lv', 'to', 'lb', 'lt', 'lij', 'li', 'ln', 'lo', + 'jbo', 'lg', 'lmo', 'hu', 'mk', 'mg', 'mt', 'mi', 'cdo', 'mwl', + 'ml', 'mdf', 'mo', 'mn', 'mr', 'mus', 'my', 'mzn', 'nah', 'fj', + 'ne', 'nl', 'nds-nl', 'cr', 'new', 'nap', 'ce', 'pih', 'no', 'nb', + 'nn', 'nrm', 'nov', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', + 'pag', 'pap', 'pi', 'pcd', 'pms', 'nds', 'pnb', 'pl', 'pt', 'pnt', + 'ps', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', + 'ru', 'sa', 'sah', 'se', 'sg', 'sc', 'sco', 'sd', 'stq', 'st', 'tn', + 'sq', 'si', 'scn', 'simple', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', + 'ckb', 'srn', 'sr', 'sh', 'fi', 'sv', 'ta', 'tl', 'kab', 'roa-tara', + 'tt', 'te', 'tet', 'th', 'ti', 'vi', 'tg', 'tokipona', 'tp', 'tpi', + 'chy', 've', 'tr', 'tk', 'tw', 'udm', 'uk', 'ur', 'ug', 'za', 'vec', + 'vo', 'fiu-vro', 'wa', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', + 'diq', 'zea', 'zh', 'zh-tw', 'zh-cn', 'zh-classical', 'zh-yue', + 'bat-smg', + ] # Order for fy: alphabetical by code, but y counts as i @@ -995,6 +1026,7 @@ 'no': self.alphabetic, 'pl': self.alphabetic, 'simple': self.alphabetic, + 'sr': self.alphabetic_latin, 'te': ['en', 'hi', 'kn', 'ta', 'ml'], 'ur': ['ar', 'fa', 'en'] + self.alphabetic, 'vi': self.alphabetic_revised, Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-02-02 18:36:24 UTC (rev 7903) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-02-03 05:10:10 UTC (rev 7904) @@ -14,7 +14,7 @@ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'eo', 'simple', 'hy', - 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', + 'nn', 'et', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'ml', 'li', 'is', 'th', 'te', 'cy', 'af', 'da', 'az', 'sq', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'zh-min-nan', 'mr', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-02-02 18:36:24 UTC (rev 7903) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-02-03 05:10:10 UTC (rev 7904) @@ -14,16 +14,16 @@ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', 'fi', 'hu', 'no', 'pt', 'ta', 'it', 'de', 'sv', 'ko', 'nl', 'lo', 'ja', 'ku', 'ar', 'kn', 'es', 'ro', 'et', 'id', 'te', - 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'li', 'is', 'fa', 'sr', - 'af', 'cs', 'sw', 'th', 'fy', 'scn', 'simple', 'br', 'oc', 'he', - 'sl', 'hy', 'sq', 'tt', 'hr', 'la', 'zh-min-nan', 'da', 'tk', 'ast', + 'gl', 'bg', 'uk', 'ca', 'ml', 'vo', 'li', 'is', 'fa', 'sr', + 'af', 'cs', 'scn', 'sw', 'th', 'fy', 'simple', 'br', 'oc', 'he', + 'sl', 'hy', 'sq', 'tt', 'hr', 'la', 'zh-min-nan', 'da', 'ast', 'tk', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', - 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'ne', 'st', 'ms', 'mr', - 'ka', 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'eu', 'mk', 'lv', - 'cy', 'ps', 'an', 'sh', 'my', 'bn', 'gu', 'mg', 'km', 'ts', + 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'ne', 'st', 'ms', 'ka', + 'mr', 'tl', 'nds', 'kl', 'lv', 'sd', 'ug', 'eu', 'ti', 'mk', + 'cy', 'ps', 'an', 'sh', 'my', 'bn', 'gu', 'km', 'mg', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'om', 'mn', 'nah', - 'ie', 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'si', 'zu', 'pa', - 'dv', 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'sg', 'jv', 'uz', + 'ie', 'yi', 'iu', 'be', 'gd', 'tg', 'nn', 'si', 'zu', 'pa', + 'dv', 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'sg', 'mi', 'jv', 'uz', 'ik', 'so', 'ha', 'ss', 'sa', 'na', 'ay', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ]

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn February 2010