Pywikipedia-svn January 2010

pywikipedia-svn@lists.wikimedia.org

7 participants
53 discussions

SVN: [7882] trunk/pywikipedia/add_text.py
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

Revision: 7882 Author: xqt Date: 2010-01-15 12:20:27 +0000 (Fri, 15 Jan 2010) Log Message: ----------- summary for de-wiki; summary shorten to 200 chars; don't ask for choice if it's not needed Modified Paths: -------------- trunk/pywikipedia/add_text.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2010-01-15 11:44:43 UTC (rev 7881) +++ trunk/pywikipedia/add_text.py 2010-01-15 12:20:27 UTC (rev 7882) @@ -83,6 +83,7 @@ msg = { 'ar': u'بوت: إضافة %s', 'cs': u'Robot přidal %s', + 'de': u'Bot: "%s" hinzugefügt', 'en': u'Bot: Adding %s', 'fr': u'Robot : Ajoute %s', 'he': u'בוט: מוסיף %s', @@ -150,7 +151,7 @@ if not addText: raise NoEnoughData('You have to specify what text you want to add!') if not summary: - summary = wikipedia.translate(wikipedia.getSite(), msg) % addText + summary = wikipedia.translate(wikipedia.getSite(), msg) % addText[:200] # When a page is tagged as "really well written" it has a star in the interwiki links. # This is a list of all the templates used (in regex format) to make the stars appear. @@ -260,18 +261,18 @@ if putText and text != newtext: wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) wikipedia.showDiff(text, newtext) - choice = '' # Let's put the changes. - while 1: + while True: # If someone load it as module, maybe it's not so useful to put the text in the page if putText: if not always: - choice = wikipedia.inputChoice(u'Do you want to accept these changes?', ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') - if choice == 'a': - always = True - if choice == 'n': - return (False, False, always) - if choice == 'y' or always: + choice = wikipedia.inputChoice(u'Do you want to accept these changes?', + ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') + if choice == 'a': + always = True + elif choice == 'n': + return (False, False, always) + if always or choice == 'y': try: if always: page.put(newtext, summary) @@ -284,7 +285,7 @@ errorCount += 1 if errorCount < 5: wikipedia.output(u'Server Error! Wait..') - time.sleep(3) + time.sleep(5) continue else: raise wikipedia.ServerError(u'Fifth Server Error!')

1 0

SVN: [7881] trunk/pywikipedia/add_text.py
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

Revision: 7881 Author: xqt Date: 2010-01-15 11:44:43 +0000 (Fri, 15 Jan 2010) Log Message: ----------- Additional options: * read addtext from a textfile * put addtext to the corresponding talk page * create it if necessary Modified Paths: -------------- trunk/pywikipedia/add_text.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2010-01-15 08:23:54 UTC (rev 7880) +++ trunk/pywikipedia/add_text.py 2010-01-15 11:44:43 UTC (rev 7881) @@ -13,8 +13,13 @@ -page Use a page as generator +-talkpage Put the text onto the talk page instead the generated on +-talk + -text Define which text to add. "\n" are interpreted as newlines. +-textfile Define a texfile name which contains the text to add + -summary Define the summary to use -except Use a regex to check if the text is already in the page @@ -67,6 +72,7 @@ import re, pagegenerators, urllib2, urllib import wikipedia +import codecs, config # This is required for the text that is shown when you run this script # with the parameter -help. @@ -140,7 +146,7 @@ yield wikipedia.Page(wikipedia.getSite(), result) def add_text(page = None, addText = None, summary = None, regexSkip = None, regexSkipUrl = None, - always = False, up = False, putText = True, oldTextGiven = None): + always = False, up = False, putText = True, oldTextGiven = None, create=False): if not addText: raise NoEnoughData('You have to specify what text you want to add!') if not summary: @@ -186,8 +192,12 @@ try: text = page.get() except wikipedia.NoPage: - wikipedia.output(u"%s doesn't exist, skip!" % page.title()) - return (False, False, always) # continue + if create: + wikipedia.output(u"%s doesn't exist, creating it!" % page.title()) + text = u'' + else: + wikipedia.output(u"%s doesn't exist, skip!" % page.title()) + return (False, False, always) # continue except wikipedia.IsRedirectPage: wikipedia.output(u"%s is a redirect, skip!" % page.title()) return (False, False, always) # continue @@ -298,13 +308,21 @@ # If none, the var is setted only for check purpose. summary = None; addText = None; regexSkip = None; regexSkipUrl = None; generator = None; always = False + textfile=None + talkPage=False + namespaces=[] # Load a lot of default generators genFactory = pagegenerators.GeneratorFactory() # Put the text above or below the text? up = False # Loading the arguments for arg in wikipedia.handleArgs(): - if arg.startswith('-text'): + if arg.startswith('-textfile'): + if len(arg) == 9: + textfile = wikipedia.input(u'Which textfile do you want to add?') + else: + textfile = arg[10:] + elif arg.startswith('-text'): if len(arg) == 5: addText = wikipedia.input(u'What text do you want to add?') else: @@ -339,17 +357,30 @@ up = True elif arg == '-always': always = True + elif arg == '-talk' or arg == '-talkpage': + talkPage = True else: genFactory.handleArg(arg) - + if textfile and not addText: + f = codecs.open(textfile, 'r', config.textfile_encoding) + addText = f.read() + f.close() if not generator: generator = genFactory.getCombinedGenerator() # Check if there are the minimal settings if not generator: raise NoEnoughData('You have to specify the generator you want to use for the script!') + if talkPage: + generator = pagegenerators.PageWithTalkPageGenerator(generator) + site = wikipedia.getSite() + for namespace in site.namespaces(): + index = site.getNamespaceIndex(namespace) + if index%2==1 and index>0: + namespaces += [index] + generator = pagegenerators.NamespaceFilterPageGenerator(generator, namespaces) # Main Loop for page in generator: - (text, newtext, always) = add_text(page, addText, summary, regexSkip, regexSkipUrl, always, up, True) + (text, newtext, always) = add_text(page, addText, summary, regexSkip, regexSkipUrl, always, up, True, create=talkPage) if __name__ == "__main__": try:

1 0

SVN: [7880] trunk/pywikipedia/solve_disambiguation.py
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

Revision: 7880 Author: xqt Date: 2010-01-15 08:23:54 +0000 (Fri, 15 Jan 2010) Log Message: ----------- additional exceptions for de-wiki Modified Paths: -------------- trunk/pywikipedia/solve_disambiguation.py Modified: trunk/pywikipedia/solve_disambiguation.py =================================================================== --- trunk/pywikipedia/solve_disambiguation.py 2010-01-15 08:16:04 UTC (rev 7879) +++ trunk/pywikipedia/solve_disambiguation.py 2010-01-15 08:23:54 UTC (rev 7880) @@ -247,19 +247,23 @@ u'Wikipedia:Links til sider med flertydige titler' ], 'de': [ - u'.+/Archiv/.+', + u'.+/Archiv.*', u'.+/Spielwiese', + 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:SirJective/.+', u'Benutzer:SrbBot/Index/.+', + u'Benutzer:PortalBot/.+', + u'Benutzer:Xqbot/.+', u'Benutzer Diskussion:.+', - u'Benutzer:Xqbot/.+', u'Lehnwort', u'Liste griechischer Wortstämme in deutschen Fremdwörtern', u'Liste von Gräzismen', u'Portal:Abkürzungen/.+', + u'Wikipedia:Administratoren/Anfragen', u'Wikipedia:Archiv/.+', u'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', u'Wikipedia:Begriffsklärung.*', @@ -271,6 +275,7 @@ u'Wikipedia:Löschkandidaten/.+', u'Wikipedia:WikiProjekt Altertumswissenschaft/.+', u'Wikipedia:WikiProjekt Verwaiste Seiten/Begriffsklärungen', + u'Wikipedia:Qualitätssicherung/.+', ], 'en': [ u'Wikipedia:Links to disambiguating pages',

1 0

SVN: [7879] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

Revision: 7879 Author: xqt Date: 2010-01-15 08:16:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- additional stuff for cc Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-01-15 06:15:27 UTC (rev 7878) +++ trunk/pywikipedia/cosmetic_changes.py 2010-01-15 08:16:04 UTC (rev 7879) @@ -241,6 +241,7 @@ text = self.removeNonBreakingSpaceBeforePercent(text) text = self.fixSyntaxSave(text) text = self.fixHtml(text) + text = self.fixStyle(text) text = self.fixTypo(text) try: text = isbn.hyphenateIsbnNumbers(text) @@ -407,7 +408,8 @@ # differently for images and categories. try: page = pywikibot.Page(self.site, titleWithSection) - except pywikibot.InvalidTitle: + #except pywikibot.InvalidTitle: + except: #empty self link occures return match.group() if page.namespace() == 0: # Replace underlines by spaces, also multiple underlines @@ -598,12 +600,25 @@ # 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) + #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. return text + def fixStyle(self, text): + exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] + # convert prettytable to wikitable class + if self.site.language in ('de', 'en'): + text = pywikibot.replaceExcept(text, ur'(class="[^"]*)prettytable([^"]*")', ur'\1wikitable\2', exceptions) + return text + def fixTypo(self, text): + exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] + # change <number> ccm -> <number> cm³ + text = pywikibot.replaceExcept(text, ur'(\d)\s* ccm', ur'\1 cm³', exceptions) + text = pywikibot.replaceExcept(text, ur'(\d)\s*ccm', ur'\1 cm³', exceptions) # Solve wrong Nº sign with °C or °F - exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace'] + # additional exception requested on fr-wiki for this stuff pattern = re.compile(u'«.*?»', re.UNICODE) exceptions.append(pattern) text = pywikibot.replaceExcept(text, ur'(\d)\s* [º°]([CF])', ur'\1 °\2', exceptions)

1 0

SVN: [7878] branches/rewrite/pywikibot/families
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

Revision: 7878 Author: xqt Date: 2010-01-15 06:15:27 +0000 (Fri, 15 Jan 2010) Log Message: ----------- update family files from trunk Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikinews_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wikisource_family.py branches/rewrite/pywikibot/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -14,12 +14,12 @@ 'en', 'de', 'fr', 'hu', 'pt', 'ja', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'zh', 'sv', 'da', 'ca', 'mk', 'tr', 'th', 'tl', 'sr', 'fa', 'id', 'is', 'ar', - 'ta', 'no', 'simple', 'ka', 'ko', 'gl', 'eo', 'bg', 'lt', 'ro', + 'ta', 'no', 'ko', 'simple', 'ka', 'gl', 'eo', 'bg', 'lt', 'ro', 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'ur', - 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'ie', 'hi', 'tg', 'bn', - 'af', 'hy', 'bs', 'te', 'pa', 'ky', 'az', 'sa', 'be', 'ast', - 'zh-min-nan', 'tt', 'cy', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', - 'als', 'su', 'uz', 'vo', 'na', 'kn', 'mn', 'kk', 'nds', 'za', + 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'ie', 'hi', 'tg', 'az', + 'bn', 'af', 'hy', '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', 'zu', 'my', ] Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -11,7 +11,7 @@ self.name = 'wikinews' self.languages_by_size = [ - 'sr', 'en', 'pl', 'de', 'it', 'fr', 'pt', 'es', 'zh', 'ja', + 'sr', 'en', 'pl', 'de', 'fr', 'it', 'pt', 'es', 'zh', 'ja', 'sv', 'ru', 'nl', 'he', 'fi', 'ar', 'cs', 'sd', 'hu', 'no', 'uk', 'ca', 'ta', 'bg', 'ro', 'tr', 'th', 'bs', ] Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -13,30 +13,30 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'cs', 'tr', 'ro', - 'ko', 'eo', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', - 'lt', 'bg', 'fa', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', - 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', + 'ko', 'eo', 'da', 'ar', 'vo', 'id', 'sk', 'vi', 'sr', 'he', + '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', 'be-x-old', 'pms', 'bn', 'ta', 'oc', 'an', - 'io', 'be', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', - 'ku', 'ast', 'ur', 'bat-smg', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', + 'lv', 'bpy', 'tl', 'jv', 'pms', 'be-x-old', 'bn', 'ta', 'oc', 'an', + 'io', 'be', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'zh-yue', 'nap', + 'ku', 'ast', 'ur', 'bat-smg', 'gu', 'ml', 'qu', 'wa', 'war', 'cv', 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'kn', 'gd', 'uz', 'pam', 'lmo', - 'yi', 'hy', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'co', 'kk', 'sah', + 'yi', 'hy', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'sah', 'kk', 'co', 'als', 'li', 'roa-rup', 'ia', 'tt', 'yo', 'bcl', 'os', 'gan', 'arz', - 'fiu-vro', 'nds-nl', 'tk', 'vls', 'mn', 'sa', 'fo', 'am', 'nrm', 'dv', - 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'se', - 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', + 'fiu-vro', 'nds-nl', 'vls', 'tk', 'mn', 'sa', 'fo', 'am', 'nrm', 'dv', + 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'diq', + 'se', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'sc', 'frp', 'mg', 'ang', - 'kw', 'pdc', 'haw', 'szl', 'ps', 'hif', 'kv', 'pa', 'ie', 'to', - 'hak', 'bo', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', + 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'bo', 'kv', 'pa', 'ie', + 'to', 'hak', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', 'mhr', 'ext', 'wo', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', - 'zea', 'srn', 'ckb', 'ay', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', - 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'av', 'ks', - 'xal', 'tet', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', + 'zea', 'ckb', 'srn', 'ay', 'pap', 'kab', 'ig', 'kg', 'or', 'ba', + 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'ab', 'sm', 'av', + 'xal', 'ks', 'tet', 'got', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', 'kl', 'pih', 'as', 'pcd', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', - 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', - 'ch', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', - 'chy', 'ak', 'fj', 'sn', 'ff', 'lg', 'sg', 'lbe', 'rn', 'tum', + 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'dz', 'bxr', 'cr', + 'ch', 'bug', 'xh', 'tn', 'fj', 'ki', 'ik', 'rw', 'st', 'ny', + 'tw', 'chy', 'ak', 'sn', 'ff', 'lg', 'sg', 'lbe', 'rn', 'tum', 'ng', ] Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -15,8 +15,8 @@ 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', - 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'az', - 'eu', 'vi', 'cy', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', + 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'cy', 'sq', + 'az', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'zh-min-nan', 'mr', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', 'kk', 'am', 'co', ] Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -14,7 +14,7 @@ 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'he', 'it', 'ar', 'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', 'sl', 'ko', 'sr', 'uk', 'ja', 'el', 'la', 'li', - 'vi', 'ml', 'yi', 'bn', 'az', 'is', 'bs', 'ca', 'hy', 'id', + 'vi', 'yi', 'ml', 'bn', 'az', 'is', 'bs', 'ca', 'hy', 'id', 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-01-15 06:12:40 UTC (rev 7877) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-01-15 06:15:27 UTC (rev 7878) @@ -12,18 +12,18 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', - 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'pt', 'ko', 'nl', - 'lo', 'ku', 'ja', 'ar', 'es', 'kn', 'ro', 'et', 'id', 'te', + 'fi', 'hu', 'no', 'ta', 'it', 'de', 'sv', 'pt', 'ko', 'nl', + 'lo', 'ja', 'ku', 'ar', 'es', 'kn', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'is', 'fa', 'li', 'sr', 'af', 'cs', 'sw', 'fy', 'scn', 'th', 'simple', 'br', 'oc', 'he', - 'sl', 'hy', 'sq', 'tt', 'la', 'hr', 'zh-min-nan', 'da', 'ast', 'tk', + 'sl', 'hy', 'sq', 'tt', 'la', 'hr', 'zh-min-nan', 'da', 'tk', 'ast', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'ka', - 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ne', 'cy', 'eu', - 'an', 'my', 'sh', 'gu', 'lv', 'mg', 'km', 'ps', 'bn', 'ts', + 'tl', 'ne', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'eu', 'cy', + 'ps', 'an', 'my', 'sh', 'lv', 'gu', 'bn', 'mg', 'km', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', - 'ie', 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'zu', 'si', 'pa', - 'dv', 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'jv', 'uz', 'ik', + 'ie', 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'si', 'zu', 'pa', + 'dv', 'mt', 'kw', 'tpi', 'gv', 'roa-rup', 'mi', 'jv', 'uz', 'ik', 'so', 'sg', 'ha', 'ss', 'sa', 'ay', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ]

1 0

SVN: [7877] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 15 Jan '10

15 Jan '10

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

1 0

SVN: [7876] trunk/pywikipedia/pagegenerators.py
by xqt＠svn.wikimedia.org 14 Jan '10

14 Jan '10

Revision: 7876 Author: xqt Date: 2010-01-14 09:22:39 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Changes wikipedia to pywikibot for easier compare with rewrite Modified Paths: -------------- trunk/pywikipedia/pagegenerators.py Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2010-01-14 08:53:49 UTC (rev 7875) +++ trunk/pywikipedia/pagegenerators.py 2010-01-14 09:22:39 UTC (rev 7876) @@ -152,17 +152,14 @@ docuReplacements = {'&params;': parameterHelp} - - - - # Standard library imports import re, codecs, sys import threading, Queue, traceback import urllib, urllib2, time # Application specific imports -import wikipedia, date, catlib, userlib, query +import wikipedia as pywikibot +import date, catlib, userlib, query import config # For python 2.4 compatibility @@ -235,7 +232,7 @@ def stop(self): """Stop the background thread.""" ## if not self.finished.isSet(): -## wikipedia.output("DEBUG: signalling %s to stop." % self) +## pywikibot.output("DEBUG: signalling %s to stop." % self) self.finished.set() def run(self): @@ -244,7 +241,7 @@ for result in self.__gen: while True: if self.finished.isSet(): -## wikipedia.output("DEBUG: %s received stop signal." % self) +## pywikibot.output("DEBUG: %s received stop signal." % self) return try: self.queue.put_nowait(result) @@ -256,7 +253,7 @@ while not self.finished.isSet() and not self.queue.empty(): time.sleep(0.25) self.stop() -## wikipedia.output("DEBUG: %s stopped because generator exhausted." % self) +## pywikibot.output("DEBUG: %s stopped because generator exhausted." % self) def AllpagesPageGenerator(start ='!', namespace = None, includeredirects = True, site = None): @@ -267,14 +264,14 @@ includeredirects equals the string 'only', only redirects are added. """ if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.allpages(start = start, namespace = namespace, includeredirects = includeredirects): yield page def PrefixingPageGenerator(prefix, namespace = None, includeredirects = True, site = None): if site is None: - site = wikipedia.getSite() - page = wikipedia.Page(site, prefix) + site = pywikibot.getSite() + page = pywikibot.Page(site, prefix) if namespace is None: namespace = page.namespace() title = page.titleWithoutNamespace() @@ -283,7 +280,7 @@ def NewpagesPageGenerator(number = 100, get_redirect = False, repeat = False, site = None, namespace = 0): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.newpages(number=number, get_redirect=get_redirect, repeat=repeat, namespace=namespace): yield page[0] @@ -297,13 +294,13 @@ def UnusedFilesGenerator(number = 100, repeat = False, site = None, extension = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.unusedfiles(number=number, repeat=repeat, extension=extension): - yield wikipedia.ImagePage(page.site(), page.title()) + yield pywikibot.ImagePage(page.site(), page.title()) def WithoutInterwikiPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.withoutinterwiki(number=number, repeat=repeat): yield page @@ -355,61 +352,61 @@ def UnCategorizedCategoryGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.uncategorizedcategories(number=number, repeat=repeat): yield page def UnCategorizedImageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.uncategorizedimages(number=number, repeat=repeat): yield page def NewimagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.newimages(number, repeat=repeat): yield page[0] def UnCategorizedPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.uncategorizedpages(number=number, repeat=repeat): yield page def LonelyPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.lonelypages(number=number, repeat=repeat): yield page def UnwatchedPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.unwatchedpages(number=number, repeat=repeat): yield page def AncientPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.ancientpages(number=number, repeat=repeat): yield page[0] def DeadendPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.deadendpages(number=number, repeat=repeat): yield page def LongPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.longpages(number=number, repeat=repeat): yield page[0] def ShortPagesPageGenerator(number = 100, repeat = False, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.shortpages(number=number, repeat=repeat): yield page[0] @@ -420,19 +417,19 @@ def RandomPageGenerator(number = 10, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for i in range(number): yield site.randompage() def RandomRedirectPageGenerator(number = 10, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for i in range(number): yield site.randomredirectpage() def RecentchangesPageGenerator(number = 100, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.recentchanges(number=number): yield page[0] @@ -444,9 +441,9 @@ name is given, the generator prompts the user. ''' if filename is None: - filename = wikipedia.input(u'Please enter the filename:') + filename = pywikibot.input(u'Please enter the filename:') if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() f = codecs.open(filename, 'r', config.textfile_encoding) R = re.compile(ur'\[\[(.+?)(?:\]\]|\|)') # title ends either before | or before ]] pageTitle = None @@ -456,30 +453,30 @@ # This makes it possible to work on different wikis using a single # text file, but also could be dangerous because you might # inadvertently change pages on another wiki! - yield wikipedia.Page(site, pageTitle) + yield pywikibot.Page(site, pageTitle) if pageTitle is None: f.seek(0) for title in f: title = title.strip() if title: - yield wikipedia.Page(site, title) + yield pywikibot.Page(site, title) f.close() def PagesFromTitlesGenerator(iterable, site=None): """Generate pages from the titles (unicode strings) yielded by iterable.""" if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for title in iterable: if not isinstance(title, basestring): break - yield wikipedia.Page(site, title) + yield pywikibot.Page(site, title) def LinksearchPageGenerator(link, step=500, site=None): """Yields all pages that include a specified link, according to [[Special:Linksearch]]. """ if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.linksearch(link, limit=step): yield page @@ -490,7 +487,7 @@ """ if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() if number > 500: # the api does not allow more than 500 results for anonymous users number = 500 @@ -503,7 +500,7 @@ Provides a list of results using the internal MediaWiki search engine """ if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for page in site.search(query, number=number, namespaces = namespaces): yield page[0] @@ -512,10 +509,10 @@ To use this generator, install pYsearch ''' def __init__(self, query = None, count = 100, site = None): # values larger than 100 fail - self.query = query or wikipedia.input(u'Please enter the search query:') + self.query = query or pywikibot.input(u'Please enter the search query:') self.count = count if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() self.site = site def queryYahoo(self, query): @@ -535,7 +532,7 @@ for url in self.queryYahoo(localQuery): if url[:len(base)] == base: title = url[len(base):] - page = wikipedia.Page(self.site, title) + page = pywikibot.Page(self.site, title) yield page class GoogleSearchPageGenerator: @@ -546,9 +543,9 @@ license key in your configuration. ''' def __init__(self, query = None, site = None): - self.query = query or wikipedia.input(u'Please enter the search query:') + self.query = query or pywikibot.input(u'Please enter the search query:') if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() self.site = site ######### @@ -581,27 +578,27 @@ while True: try: - wikipedia.output(u'Querying Google AJAX Search API...') #, offset %i' % offset) + pywikibot.output(u'Querying Google AJAX Search API...') #, offset %i' % offset) result = json.loads(self.site.getUrl(url, refer = config.google_api_refer, no_hostname=True)) for res in result['responseData']['results']: yield res['url'] except: - wikipedia.output(u"An error occured. Retrying in 10 seconds...") + pywikibot.output(u"An error occured. Retrying in 10 seconds...") time.sleep(10) continue def queryViaSoapApi(self, query): import google - google.LICENSE_KEY = config.google_key offset = 0 estimatedTotalResultsCount = None - while not estimatedTotalResultsCount or offset < estimatedTotalResultsCount: + while not estimatedTotalResultsCount \ + or offset < estimatedTotalResultsCount: while (True): # Google often yields 502 errors. try: - wikipedia.output(u'Querying Google, offset %i' % offset) + pywikibot.output(u'Querying Google, offset %i' % offset) data = google.doGoogleSearch(query, start = offset, filter = False) break except KeyboardInterrupt: @@ -611,7 +608,7 @@ # can happen here, depending on the module used. It's not easy # to catch this properly because pygoogle decides which one of # the soap modules to use. - wikipedia.output(u"An error occured. Retrying in 10 seconds...") + pywikibot.output(u"An error occured. Retrying in 10 seconds...") time.sleep(10) continue @@ -620,7 +617,7 @@ yield result.URL # give an estimate of pages to work on, but only once. if not estimatedTotalResultsCount: - wikipedia.output(u'Estimated total result count: %i pages.' % data.meta.estimatedTotalResultsCount) + pywikibot.output(u'Estimated total result count: %i pages.' % data.meta.estimatedTotalResultsCount) estimatedTotalResultsCount = data.meta.estimatedTotalResultsCount #print 'estimatedTotalResultsCount: ', estimatedTotalResultsCount offset += 10 @@ -640,7 +637,7 @@ #offset = 0 #while True: - #wikipedia.output("Google: Querying page %d" % (offset / 100 + 1)) + #pywikibot.output("Google: Querying page %d" % (offset / 100 + 1)) #address = "http://www.google.com/search?q=%s&num=100&hl=en&start=%d" % (urllib.quote_plus(query), offset) ## we fake being Firefox because Google blocks unknown browsers #request = urllib2.Request(address, None, {'User-Agent': 'Mozilla/5.0 (X11; U; Linux i686; de; rv:1.8) Gecko/20051128 SUSE/1.5-0.1 Firefox/1.5'}) @@ -658,11 +655,12 @@ def __iter__(self): # restrict query to local site localQuery = '%s site:%s' % (self.query, self.site.hostname()) - base = 'http://%s%s' % (self.site.hostname(), self.site.nice_get_address('')) + base = 'http://%s%s' % (self.site.hostname(), + self.site.nice_get_address('')) for url in self.queryGoogle(localQuery): if url[:len(base)] == base: title = url[len(base):] - page = wikipedia.Page(self.site, title) + page = pywikibot.Page(self.site, title) # Google contains links in the format http://de.wikipedia.org/wiki/en:Foobar if page.site() == self.site: yield page @@ -670,12 +668,12 @@ def MySQLPageGenerator(query, site = None): import MySQLdb as mysqldb if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() conn = mysqldb.connect(config.db_hostname, db = site.dbName(), user = config.db_username, passwd = config.db_password) cursor = conn.cursor() - wikipedia.output(u'Executing query:\n%s' % query) + pywikibot.output(u'Executing query:\n%s' % query) query = query.encode(site.encoding()) cursor.execute(query) while True: @@ -693,30 +691,30 @@ pageTitle = '%s:%s' % (namespace, pageName) else: pageTitle = pageName - page = wikipedia.Page(site, pageTitle) + page = pywikibot.Page(site, pageTitle) yield page def YearPageGenerator(start = 1, end = 2050, site = None): if site is None: - site = wikipedia.getSite() - wikipedia.output(u"Starting with year %i" % start) + site = pywikibot.getSite() + pywikibot.output(u"Starting with year %i" % start) for i in xrange(start, end + 1): if i % 100 == 0: - wikipedia.output(u'Preparing %i...' % i) + pywikibot.output(u'Preparing %i...' % i) # There is no year 0 if i != 0: current_year = date.formatYear(site.lang, i ) - yield wikipedia.Page(site, current_year) + yield pywikibot.Page(site, current_year) def DayPageGenerator(startMonth = 1, endMonth = 12, site = None): if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() fd = date.FormatDate(site) - firstPage = wikipedia.Page(site, fd(startMonth, 1)) - wikipedia.output(u"Starting with %s" % firstPage.aslink()) + firstPage = pywikibot.Page(site, fd(startMonth, 1)) + pywikibot.output(u"Starting with %s" % firstPage.aslink()) for month in xrange(startMonth, endMonth+1): for day in xrange(1, date.getNumberOfDaysInMonth(month)+1): - yield wikipedia.Page(site, fd(month, day)) + yield pywikibot.Page(site, fd(month, day)) def NamespaceFilterPageGenerator(generator, namespaces, site = None): """ @@ -728,7 +726,7 @@ """ # convert namespace names to namespace numbers if site is None: - site = wikipedia.getSite() + site = pywikibot.getSite() for i in xrange(len(namespaces)): ns = namespaces[i] if isinstance(ns, unicode) or isinstance(ns, str): @@ -761,8 +759,8 @@ for page in generator: if isIgnored(page): - if wikipedia.verbose: - wikipedia.output('Ignoring page %s' % page.title()) + if pywikibot.verbose: + pywikibot.output('Ignoring page %s' % page.title()) else: yield page @@ -867,7 +865,7 @@ pass except Exception, e: traceback.print_exc() - wikipedia.output(unicode(e)) + pywikibot.output(unicode(e)) def preload(self, page_list, retry=False): try: @@ -880,13 +878,13 @@ if page.site() == site] page_list = [page for page in page_list if page.site() != site] - wikipedia.getall(site, pagesThisSite) + pywikibot.getall(site, pagesThisSite) for page in pagesThisSite: yield page except IndexError: # Can happen if the pages list is empty. Don't care. pass - except wikipedia.SaxError: + except pywikibot.SaxError: if not retry: # Retry once. self.preload(page_list, retry=True) @@ -926,9 +924,9 @@ return genToReturn def getCategoryGen(self, arg, length, recurse = False): - site = wikipedia.getSite() + site = pywikibot.getSite() if len(arg) == length: - categoryname = wikipedia.input(u'Please enter the category name:') + categoryname = pywikibot.input(u'Please enter the category name:') else: categoryname = arg[length + 1:] categoryname = categoryname.replace('#', '|') @@ -943,9 +941,9 @@ return CategorizedPageGenerator(cat, start=startfrom, recurse=recurse) def setSubCategoriesGen(self, arg, length, recurse = False): - site = wikipedia.getSite() + site = pywikibot.getSite() if len(arg) == length: - categoryname = wikipedia.input(u'Please enter the category name:') + categoryname = pywikibot.input(u'Please enter the category name:') else: categoryname = arg[length + 1:] @@ -970,19 +968,19 @@ arguments have been parsed to get the final output generator. """ - site = wikipedia.getSite() + site = pywikibot.getSite() gen = None if arg.startswith('-filelinks'): fileLinksPageTitle = arg[11:] if not fileLinksPageTitle: - fileLinksPageTitle = wikipedia.input( + fileLinksPageTitle = pywikibot.input( u'Links to which image page should be processed?') if fileLinksPageTitle.startswith(site.namespace(6) + ":"): - fileLinksPage = wikipedia.ImagePage(site, + fileLinksPage = pywikibot.ImagePage(site, fileLinksPageTitle) else: - fileLinksPage = wikipedia.ImagePage(site, + fileLinksPage = pywikibot.ImagePage(site, 'Image:' + fileLinksPageTitle) gen = FileLinksGenerator(fileLinksPage) elif arg.startswith('-unusedfiles'): @@ -1005,8 +1003,8 @@ elif arg.startswith('-interwiki'): title = arg[11:] if not title: - title = wikipedia.input(u'Which page should be processed?') - page = wikipedia.Page(site, title) + title = pywikibot.input(u'Which page should be processed?') + page = pywikibot.Page(site, title) gen = InterwikiPageGenerator(page) elif arg.startswith('-randomredirect'): if len(arg) == 15: @@ -1026,12 +1024,12 @@ elif arg.startswith('-file'): textfilename = arg[6:] if not textfilename: - textfilename = wikipedia.input( + textfilename = pywikibot.input( u'Please enter the local file name:') gen = TextfilePageGenerator(textfilename) elif arg.startswith('-namespace'): if len(arg) == len('-namespace'): - self.namespaces.append(wikipedia.input(u'What namespace are you filtering on?')) + self.namespaces.append(pywikibot.input(u'What namespace are you filtering on?')) else: self.namespaces.extend(arg[len('-namespace:'):].split(",")) return True @@ -1050,11 +1048,11 @@ gen = self.getCategoryGen(arg, 7, recurse = True) elif arg.startswith('-page'): if len(arg) == len('-page'): - gen = [wikipedia.Page(site, - wikipedia.input( + gen = [pywikibot.Page(site, + pywikibot.input( u'What page do you want to use?'))] else: - gen = [wikipedia.Page(site, arg[len('-page:'):])] + gen = [pywikibot.Page(site, arg[len('-page:'):])] elif arg.startswith('-uncatfiles'): gen = UnCategorizedImageGenerator() elif arg.startswith('-uncatcat'): @@ -1064,29 +1062,29 @@ elif arg.startswith('-ref'): referredPageTitle = arg[5:] if not referredPageTitle: - referredPageTitle = wikipedia.input( + referredPageTitle = pywikibot.input( u'Links to which page should be processed?') - referredPage = wikipedia.Page(site, referredPageTitle) + referredPage = pywikibot.Page(site, referredPageTitle) gen = ReferringPageGenerator(referredPage) elif arg.startswith('-links'): linkingPageTitle = arg[7:] if not linkingPageTitle: - linkingPageTitle = wikipedia.input( + linkingPageTitle = pywikibot.input( u'Links from which page should be processed?') - linkingPage = wikipedia.Page(site, linkingPageTitle) + linkingPage = pywikibot.Page(site, linkingPageTitle) gen = LinkedPageGenerator(linkingPage) elif arg.startswith('-weblink'): url = arg[9:] if not url: - url = wikipedia.input( + url = pywikibot.input( u'Pages with which weblink should be processed?') gen = LinksearchPageGenerator(url) elif arg.startswith('-transcludes'): transclusionPageTitle = arg[len('-transcludes:'):] if not transclusionPageTitle: - transclusionPageTitle = wikipedia.input( + transclusionPageTitle = pywikibot.input( u'Pages that transclude which page should be processed?') - transclusionPage = wikipedia.Page(site, + transclusionPage = pywikibot.Page(site, "%s:%s" % (site.namespace(10), transclusionPageTitle)) gen = ReferringPageGenerator(transclusionPage, @@ -1094,35 +1092,35 @@ elif arg.startswith('-gorandom'): for firstPage in RandomPageGenerator(number = 1): firstPageTitle = firstPage.title() - namespace = wikipedia.Page(site, firstPageTitle).namespace() - firstPageTitle = wikipedia.Page(site, + namespace = pywikibot.Page(site, firstPageTitle).namespace() + firstPageTitle = pywikibot.Page(site, firstPageTitle).titleWithoutNamespace() gen = AllpagesPageGenerator(firstPageTitle, namespace, includeredirects=False) elif arg.startswith('-start'): if arg.startswith('-startxml'): - wikipedia.output(u'-startxml : wrong parameter') + pywikibot.output(u'-startxml : wrong parameter') sys.exit() firstPageTitle = arg[7:] if not firstPageTitle: - firstPageTitle = wikipedia.input( + firstPageTitle = pywikibot.input( u'At which page do you want to start?') if self.namespaces != []: namespace = self.namespaces[0] else: - namespace = wikipedia.Page(site, firstPageTitle).namespace() + namespace = pywikibot.Page(site, firstPageTitle).namespace() - firstPageTitle = wikipedia.Page(site, + firstPageTitle = pywikibot.Page(site, firstPageTitle).titleWithoutNamespace() gen = AllpagesPageGenerator(firstPageTitle, namespace, includeredirects=False) elif arg.startswith('-redirectonly'): firstPageTitle = arg[14:] if not firstPageTitle: - firstPageTitle = wikipedia.input( + firstPageTitle = pywikibot.input( u'At which page do you want to start?') - namespace = wikipedia.Page(site, firstPageTitle).namespace() - firstPageTitle = wikipedia.Page(site, + namespace = pywikibot.Page(site, firstPageTitle).namespace() + firstPageTitle = pywikibot.Page(site, firstPageTitle).titleWithoutNamespace() gen = AllpagesPageGenerator(firstPageTitle, namespace, includeredirects='only') @@ -1130,11 +1128,11 @@ prefix = arg[13:] namespace = None if not prefix: - prefix = wikipedia.input( + prefix = pywikibot.input( u'What page names are you looking for?') gen = PrefixingPageGenerator(prefix = prefix) elif arg.startswith('-newimages'): - limit = arg[11:] or wikipedia.input( + limit = arg[11:] or pywikibot.input( u'How many images do you want to load?') gen = NewimagesPageGenerator(number = int(limit)) elif arg.startswith('-new'): @@ -1145,14 +1143,14 @@ elif arg.startswith('-imagelinks'): imagelinkstitle = arg[len('-imagelinks:'):] if not imagelinkstitle: - imagelinkstitle = wikipedia.input( + imagelinkstitle = pywikibot.input( u'Images on which page should be processed?') - imagelinksPage = wikipedia.Page(site, imagelinkstitle) + imagelinksPage = pywikibot.Page(site, imagelinkstitle) gen = ImagesPageGenerator(imagelinksPage) elif arg.startswith('-search'): mediawikiQuery = arg[8:] if not mediawikiQuery: - mediawikiQuery = wikipedia.input( + mediawikiQuery = pywikibot.input( u'What do you want to search for?') # In order to be useful, all namespaces are required gen = SearchPageGenerator(mediawikiQuery, namespaces = []) @@ -1160,7 +1158,7 @@ gen = GoogleSearchPageGenerator(arg[8:]) elif arg.startswith('-titleregex'): if len(arg) == 11: - regex = wikipedia.input(u'What page names are you looking for?') + regex = pywikibot.input(u'What page names are you looking for?') else: regex = arg[12:] gen = RegexFilterPageGenerator(site.allpages(), regex) @@ -1177,16 +1175,16 @@ if __name__ == "__main__": try: genFactory = GeneratorFactory() - for arg in wikipedia.handleArgs(): + for arg in pywikibot.handleArgs(): if not genFactory.handleArg(arg): - wikipedia.showHelp('pagegenerators') + pywikibot.showHelp('pagegenerators') break else: gen = genFactory.getCombinedGenerator() if gen: for page in gen: - wikipedia.output(page.title(), toStdout = True) + pywikibot.output(page.title(), toStdout = True) else: - wikipedia.showHelp('pagegenerators') + pywikibot.showHelp('pagegenerators') finally: - wikipedia.stopme() + pywikibot.stopme()

1 0

SVN: [7875] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 14 Jan '10

14 Jan '10

Revision: 7875 Author: xqt Date: 2010-01-14 08:53:49 +0000 (Thu, 14 Jan 2010) Log Message: ----------- do not edit vandalized pages Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-01-13 07:15:42 UTC (rev 7874) +++ trunk/pywikipedia/redirect.py 2010-01-14 08:53:49 UTC (rev 7875) @@ -690,11 +690,15 @@ else: wikipedia.output( u' Links to: %s.' - % targetPage.aslink()) + % targetPage.aslink()) + if targetPage.site().sitename() == 'wikipedia:en' \ + and targetPage.title() == 'Target page name': + wikipedia.output(u"Skipping: Redirect source is vandalized.") + break if targetPage.site() != self.site: wikipedia.output( - u'Warning: redirect target (%s) is on a different site.' - % (targetPage.aslink())) + u'Warning: redirect target (%s) is on a different site.' + % (targetPage.aslink())) if self.always: break # skip if automatic # watch out for redirect loops @@ -703,8 +707,8 @@ targetPage.sectionFreeTitle()) ) > 0: wikipedia.output( - u'Warning: Redirect target %s forms a redirect loop.' - % targetPage.aslink()) + u'Warning: Redirect target %s forms a redirect loop.' + % targetPage.aslink()) break ###xqt doesn't work. edits twice! try: content = targetPage.get(get_redirect=True) @@ -761,7 +765,7 @@ % redir.title()) except wikipedia.Error, error: wikipedia.output( - u"Unexpected error occurred trying to save [[%s]]: %s" + u"Unexpected error occurred trying to save [[%s]]: %s" % (redir.title(), error)) break

1 0

SVN: [7874] trunk/pywikipedia
by xqt＠svn.wikimedia.org 13 Jan '10

13 Jan '10

Revision: 7874 Author: xqt Date: 2010-01-13 07:15:42 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Update from rewrite Modified Paths: -------------- trunk/pywikipedia/date.py trunk/pywikipedia/families/mac_wikia_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/strategy_family.py trunk/pywikipedia/families/wikipedia_family.py trunk/pywikipedia/families/wowwiki_family.py trunk/pywikipedia/family.py trunk/pywikipedia/login.py trunk/pywikipedia/pagegenerators.py trunk/pywikipedia/userlib.py Modified: trunk/pywikipedia/date.py =================================================================== --- trunk/pywikipedia/date.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/date.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -19,7 +19,6 @@ import re import wikipedia - # # Different collections of well known formats # @@ -147,7 +146,6 @@ return dh_noConv( value, pattern, formatLimits['MillenniumBC'][0] ) - def decSinglVal( v ): return v[0] @@ -199,34 +197,34 @@ to accept all other values""" return True -def monthName(lang,ind): +def monthName(lang, ind): return formats['MonthName'][lang](ind) # Helper for KN: digits representation -_knDigits=u'೦೧೨೩೪೫೬೭೮೯' -_knDigitsToLocal=dict([(ord(unicode(i)), _knDigits[i]) for i in range(10)]) -_knLocalToDigits=dict([(ord(_knDigits[i]), unicode(i)) for i in range(10)]) +_knDigits = u'೦೧೨೩೪೫೬೭೮೯' +_knDigitsToLocal = dict([(ord(unicode(i)), _knDigits[i]) for i in range(10)]) +_knLocalToDigits = dict([(ord(_knDigits[i]), unicode(i)) for i in range(10)]) # Helper for Urdu/Persian languages -_faDigits=u'۰۱۲۳۴۵۶۷۸۹' -_faDigitsToLocal=dict([(ord(unicode(i)), _faDigits[i]) for i in range(10)]) -_faLocalToDigits=dict([(ord(_faDigits[i]), unicode(i)) for i in range(10)]) +_faDigits = u'۰۱۲۳۴۵۶۷۸۹' +_faDigitsToLocal = dict([(ord(unicode(i)), _faDigits[i]) for i in range(10)]) +_faLocalToDigits = dict([(ord(_faDigits[i]), unicode(i)) for i in range(10)]) # Helper for HI:, MR: -_hiDigits=u'०१२३४५६७८९' -_hiDigitsToLocal=dict([(ord(unicode(i)), _hiDigits[i]) for i in range(10)]) -_hiLocalToDigits=dict([(ord(_hiDigits[i]), unicode(i)) for i in range(10)]) +_hiDigits = u'०१२३४५६७८९' +_hiDigitsToLocal = dict([(ord(unicode(i)), _hiDigits[i]) for i in range(10)]) +_hiLocalToDigits = dict([(ord(_hiDigits[i]), unicode(i)) for i in range(10)]) # Helper for BN: -_bnDigits=u'০১২৩৪৫৬৭৮৯' -_bnDigitsToLocal=dict([(ord(unicode(i)), _bnDigits[i]) for i in range(10)]) -_bnLocalToDigits=dict([(ord(_bnDigits[i]), unicode(i)) for i in range(10)]) +_bnDigits = u'০১২৩৪৫৬৭৮৯' +_bnDigitsToLocal = dict([(ord(unicode(i)), _bnDigits[i]) for i in range(10)]) +_bnLocalToDigits = dict([(ord(_bnDigits[i]), unicode(i)) for i in range(10)]) # Helper for GU: -_guDigits=u'૦૧૨૩૪૫૬૭૮૯' -_guDigitsToLocal=dict([(ord(unicode(i)), _guDigits[i]) for i in range(10)]) -_guLocalToDigits=dict([(ord(_guDigits[i]), unicode(i)) for i in range(10)]) +_guDigits = u'૦૧૨૩૪૫૬૭૮૯' +_guDigitsToLocal = dict([(ord(unicode(i)), _guDigits[i]) for i in range(10)]) +_guLocalToDigits = dict([(ord(_guDigits[i]), unicode(i)) for i in range(10)]) def intToLocalDigitsStr( value, digitsToLocalDict ): # Encode an integer value into a textual form. @@ -279,7 +277,7 @@ 'T' : ( _decimalDigits, lambda v: unicode(v+543), lambda v: int(v)-543 ), } -# Allows to search for '(%%)|(%d)|(%R)|...", and allows one digit 1-9 too set the size of zero-padding for numbers +# Allows to search for '(%%)|(%d)|(%R)|...", and allows one digit 1-9 to set the size of zero-padding for numbers _reParameters = re.compile(u'|'.join([ u'(%%[1-9]?%s)' % s for s in _digitDecoders.keys() ])) # A map of sitecode+pattern to (re matching object and corresponding decoders) @@ -301,7 +299,7 @@ for s in _reParameters.split(pattern): if s is None: pass - elif len(s) in [2,3] and s[0]=='%' and s[-1] in _digitDecoders and (len(s)==2 or s[1] in _decimalDigits): + elif len(s) in [2, 3] and s[0] == '%' and s[-1] in _digitDecoders and (len(s) == 2 or s[1] in _decimalDigits): # Must match a "%2d" or "%d" style dec = _digitDecoders[s[-1]] if type(dec) in _stringTypes: @@ -741,7 +739,7 @@ 'ca' : lambda m: multi( m, [ (lambda v: dh_decAD( v, u'Dècada de %d' ), lambda p: p == 1970), (lambda v: dh_decAD( v, u'Dècada del %d' ), alwaysTrue)]), - + #1970s => '1970-1979' 'cs' : lambda m: multi( m, [ (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), @@ -1033,29 +1031,29 @@ (lambda v: dh_centuryBC( v, u'%dde eeu v.C.' ), alwaysTrue)]), 'bg' : lambda v: dh_centuryBC( v, u'%d век пр.н.е.' ), 'br' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Iañ kantved kt JK'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Eil kantved kt JK'), lambda p: p == 2), - (lambda v: dh_centuryBC( v, u'%Re kantved kt JK'), lambda p: p in [2,3]), - (lambda v: dh_centuryBC( v, u'%Rvet kantved kt JK'), alwaysTrue)]), + (lambda v: dh_constVal( v, 1, u'Iañ kantved kt JK'), lambda p: p == 1), + (lambda v: dh_constVal( v, 2, u'Eil kantved kt JK'), lambda p: p == 2), + (lambda v: dh_centuryBC( v, u'%Re kantved kt JK'), lambda p: p in [2,3]), + (lambda v: dh_centuryBC( v, u'%Rvet kantved kt JK'), alwaysTrue)]), 'ca' : lambda v: dh_centuryBC( v, u'Segle %R aC' ), 'cs' : lambda v: dh_centuryBC( v, u'%d. století př. n. l.' ), 'da' : lambda v: dh_centuryBC( v, u'%d. århundrede f.Kr.' ), 'de' : lambda v: dh_centuryBC( v, u'%d. Jahrhundert v. Chr.' ), 'el' : lambda v: dh_centuryBC( v, u'%dος αιώνας π.Χ.' ), 'en' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%dst century BC' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_centuryBC( v, u'%dnd century BC' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_centuryBC( v, u'%drd century BC' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_centuryBC( v, u'%dth century BC' ), alwaysTrue)]), + (lambda v: dh_centuryBC( v, u'%dst century BC' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), + (lambda v: dh_centuryBC( v, u'%dnd century BC' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), + (lambda v: dh_centuryBC( v, u'%drd century BC' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), + (lambda v: dh_centuryBC( v, u'%dth century BC' ), alwaysTrue)]), 'eo' : lambda v: dh_centuryBC( v, u'%d-a jarcento a.K.' ), 'es' : lambda v: dh_centuryBC( v, u'Siglo %R adC' ), 'et' : lambda v: dh_centuryBC( v, u'%d. aastatuhat eKr' ), 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata eaa.'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-luku eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), + (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata eaa.'), lambda p: p == 1), + (lambda v: dh( v, u'%d00-luku eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), 'fr' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%Rer siècle av. J.-C.' ), lambda p: p == 1), - (lambda v: dh_centuryBC( v, u'%Re siècle av. J.-C.' ), alwaysTrue)]), + (lambda v: dh_centuryBC( v, u'%Rer siècle av. J.-C.' ), lambda p: p == 1), + (lambda v: dh_centuryBC( v, u'%Re siècle av. J.-C.' ), alwaysTrue)]), 'he' : lambda v: dh_centuryBC( v, u'המאה ה־%d לפני הספירה' ), 'hr' : lambda v: dh_centuryBC( v, u'%d. stoljeće p.n.e.' ), 'id' : lambda v: dh_centuryBC( v, u'Abad ke-%d SM' ), @@ -1491,21 +1489,21 @@ # In addition, tuple contains start, end, and step values that will be used to test the formats table for internal consistency. # formatLimits = { - 'MonthName' : (lambda v: 1<=v and v<13, 1,13), - 'Number' : (lambda v: 0<=v and v<1000000, 0,1001), + 'MonthName' : (lambda v: 1 <=v and v < 13, 1, 13), + 'Number' : (lambda v: 0 <=v and v < 1000000, 0, 1001), - 'YearAD' : (lambda v: 0<=v and v<2501, 0,2501), - 'YearBC' : (lambda v: 0<=v and v<4001, 0,501), # zh: has years as old as 前1700年 - 'DecadeAD' : (lambda v: 0<=v and v<2501, 0,2501), # At some point need to re-add "and v%10==0" to the limitation - 'DecadeBC' : (lambda v: 0<=v and v<4001, 0,501), # zh: has decades as old as 前1700年代 - 'CenturyAD' : (lambda v: 1<=v and v<41, 1,23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'CenturyBC' : (lambda v: 1<=v and v<91, 1,23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'MillenniumAD' : (lambda v: 1<=v and v<6, 1,4), # For milleniums, only test first 3 AD Milleniums, - 'MillenniumBC' : (lambda v: 1<=v and v<20, 1,2), # And only 1 BC Millenium - 'CenturyAD_Cat' : (lambda v: 1<=v and v<41, 1,23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'CenturyBC_Cat' : (lambda v: 1<=v and v<41, 1,23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'Cat_Year_MusicAlbums' : (lambda v: 1950<=v and v<2021, 1950,2021), - 'CurrEvents' : (lambda v: 0<=v and v<1, 0,1), + 'YearAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), + 'YearBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has years as old as 前1700年 + 'DecadeAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), # At some point need to re-add "and v%10==0" to the limitation + 'DecadeBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has decades as old as 前1700年代 + 'CenturyAD' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'CenturyBC' : (lambda v: 1 <=v and v < 91, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'MillenniumAD' : (lambda v: 1 <=v and v < 6, 1, 4), # For milleniums, only test first 3 AD Milleniums, + 'MillenniumBC' : (lambda v: 1 <=v and v < 20, 1, 2), # And only 1 BC Millenium + 'CenturyAD_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'CenturyBC_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'Cat_Year_MusicAlbums' : (lambda v: 1950 <= v and v < 2021, 1950, 2021), + 'CurrEvents' : (lambda v: 0 <= v and v < 1, 0, 1), } # All month of year articles are in the same format @@ -1517,7 +1515,7 @@ _formatLimit_DayOfMonth30 = (lambda v: 1 <= v and v < 31, 1, 31) _formatLimit_DayOfMonth29 = (lambda v: 1 <= v and v < 30, 1, 30) for monthId in range(12): - if (monthId+1) in [1,3,5,7,8,10,12]: + if (monthId + 1) in [1, 3, 5, 7, 8, 10, 12]: formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth31 # 31 days a month elif (monthId+1) == 2: # February formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth29 # 29 days a month @@ -1567,8 +1565,6 @@ else: return formats['YearAD'][lang](year) - - # # # Map testing methods @@ -1603,7 +1599,7 @@ for code, convFunc in formats[formatName].iteritems(): # import time # startClock = time.clock() - for value in range(start,stop,step): + for value in range(start, stop, step): try: if not predicate(value): raise AssertionError(" Not a valid value for this format.") @@ -1618,11 +1614,14 @@ # wikipedia.output( u"%s\t%s\t%f" % (formatName, code, time.clock() - startClock) ) def test(quick = False, showAll = False): - """This is a test function, to be used interactivelly to test entire format convesion map at once + """This is a test function, to be used interactively to test entire + format conversion map at once + Usage example: run python interpreter >>> import date >>> date.test() + """ for formatName in formats.keys(): Modified: trunk/pywikipedia/families/mac_wikia_family.py =================================================================== --- trunk/pywikipedia/families/mac_wikia_family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/families/mac_wikia_family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -76,7 +76,7 @@ self.languages_by_size = ['en','de'] def version(self, code): - return "1.10alpha" + return "1.14" def scriptpath(self, code): return '' Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/families/meta_family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -133,7 +133,6 @@ 'mediawiki', 'test', 'incubator', 'commons', 'species', ] - def version(self,code): return '1.16alpha-wmf' Modified: trunk/pywikipedia/families/strategy_family.py =================================================================== --- trunk/pywikipedia/families/strategy_family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/families/strategy_family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -31,7 +31,6 @@ self.interwiki_forward = 'wikipedia' - def version(self, code): return '1.16alpha-wmf' Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -1175,7 +1175,7 @@ def get_known_families(self, site): # In Swedish Wikipedia 's:' is part of page title not a family # prefix for 'wikisource'. - if site.lang == 'sv': + if site.language() == 'sv': d = self.known_families.copy() d.pop('s') ; d['src'] = 'wikisource' return d Modified: trunk/pywikipedia/families/wowwiki_family.py =================================================================== --- trunk/pywikipedia/families/wowwiki_family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/families/wowwiki_family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -28,8 +28,8 @@ 'nl': 'nl.wow.wikia.com', 'no': 'no.wow.wikia.com', 'pl': 'pl.wow.wikia.com', + 'pt': 'pt.wow.wikia.com', 'pt-br': 'pt-br.wow.wikia.com', - 'pt': 'pt.wow.wikia.com', 'ro': 'ro.wow.wikia.com', 'ru': 'ru.wow.wikia.com', 'sk': 'sk.wow.wikia.com', Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/family.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -2677,7 +2677,8 @@ }, } - # letters that can follow a wikilink and are regarded as part of this link + # letters that can follow a wikilink and are regarded as part + # of this link # This depends on the linktrail setting in LanguageXx.php and on # [[MediaWiki:Linktrail]]. # Note: this is a regular expression. @@ -2710,6 +2711,8 @@ # for line in f.readlines(): # s = line[:line.index('\t')] # print ((" '%s':" % s).ljust(20) + ("'%s'," % s)) + + # TODO: replace this with API interwikimap call self.known_families = { 'abbenormal': 'abbenormal', 'aboutccc': 'aboutccc', @@ -3157,7 +3160,7 @@ # a list of languages. If there are at least the number of interwiki # links, all languages in the list should be placed at the front as # well as in the normal list. - self.interwiki_putfirst_doubled = {} + self.interwiki_putfirst_doubled = {} # THIS APPEARS TO BE UNUSED! # Some families, e. g. commons and meta, are not multilingual and # forward interlanguage links to another family (wikipedia). @@ -3274,7 +3277,9 @@ elif fallback: return self.linktrails[fallback] else: - raise KeyError('ERROR: linktrail in language %s unknown' % code) + raise KeyError( + "ERROR: linktrail in language %s unknown" + % code) def namespace(self, code, ns_number, fallback = '_default', all = False): if not self.isDefinedNS(ns_number): @@ -3408,7 +3413,7 @@ return self.disambiguationTemplates[fallback] else: raise KeyError( - 'ERROR: title for disambig template in language %s unknown' + "ERROR: title for disambig template in language %s unknown" % code) # Returns the title of the special namespace in language 'code', taken from @@ -3912,6 +3917,16 @@ wiki""" return self.code2encoding(code), + # aliases + def encoding(self, code): + """Return the encoding for a specific language wiki""" + return self.code2encoding(code) + + def encodings(self, code): + """Return a list of historical encodings for a specific language + wiki""" + return self.code2encodings(code) + def __cmp__(self, otherfamily): try: return cmp(self.name, otherfamily.name) @@ -3921,6 +3936,9 @@ def __hash__(self): return hash(self.name) + def __repr__(self): + return 'Family("%s")' % self.name + def RversionTab(self, code): """Change this to some regular expression that shows the page we found is an existing page, in case the normal regexp does not work.""" @@ -3940,7 +3958,7 @@ return datetime.utcnow() + self.servergmtoffset def isPublic(self): - """Does the wiki require logging in before viewing it ?""" + """Does the wiki require logging in before viewing it?""" return True def post_get_convert(self, site, getText): Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/login.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -1,11 +1,10 @@ #!/usr/bin/python # -*- coding: utf-8 -*- - """ Script to log the robot in to a wiki account. Suggestion is to make a special account to use for robot use only. Make -sure this robot account is well known on your home wikipedia before using. +sure this robot account is well known on your home wiki before using. Parameters: @@ -37,19 +36,20 @@ check the output. Using -log is recommended: this will output a lot of data -If not given as parameter, the script will ask for your username and password -(password entry will be hidden), log in to your home wiki using this -combination, and store the resulting cookies (containing your password hash, +If not given as parameter, the script will ask for your username and +password (password entry will be hidden), log in to your home wiki using +this combination, and store the resulting cookies (containing your password so keep it secured!) in a file in the login-data subdirectory. -All scripts in this library will be looking for this cookie file and will use -the login information if it is present. +All scripts in this library will be looking for this cookie file and will +use the login information if it is present. To log out, throw away the XX-login.data file that is created in the login-data subdirectory. """ # # (C) Rob W.W. Hooft, 2003 +# (C) Pywikipedia bot team, 2003-2010 # # Distributed under the terms of the MIT license. # @@ -80,11 +80,11 @@ wikipedia.output(u"You are not logged in on %s." % repr(mysite)) class LoginManager: - def __init__(self, password = None, sysop = False, site = None, username=None, verbose=False): + def __init__(self, password=None, sysop=False, site=None, username=None, verbose=False): self.site = site or wikipedia.getSite() self.sysop = sysop if username: - self.username=username + self.username = username # perform writeback. if site.family.name not in config.usernames: config.usernames[site.family.name]={} @@ -92,7 +92,8 @@ else: if sysop: try: - self.username = config.sysopnames[self.site.family.name][self.site.lang] + self.username = config.sysopnames\ + [self.site.family.name][self.site.lang] except: raise wikipedia.NoUsername(u'ERROR: Sysop username for %s:%s is undefined.\nIf you have a sysop account for that site, please add such a line to user-config.py:\n\nsysopnames[\'%s\'][\'%s\'] = \'myUsername\'' % (self.site.family.name, self.site.lang, self.site.family.name, self.site.lang)) else: @@ -110,7 +111,8 @@ Checks whether the bot is listed on a specific page to comply with the policy on the respective wiki. """ - if self.site.family.name in botList and self.site.language() in botList[self.site.family.name]: + if self.site.family.name in botList \ + and self.site.language() in botList[self.site.family.name]: botListPageTitle = wikipedia.translate(self.site.language(), botList) botListPage = wikipedia.Page(self.site, botListPageTitle) for linkedPage in botListPage.linkedPages(): @@ -225,11 +227,12 @@ def storecookiedata(self, filename, data): """ - Stores cookie data. + Store cookie data. The argument data is the raw data, as returned by getCookie(). - Returns nothing.""" + Returns nothing. + """ s = u'' for v, k in data.iteritems(): s += "%s=%s\n" % (v, k) @@ -239,8 +242,10 @@ def readPassword(self): """ - Reads passwords from a file. DO NOT FORGET TO REMOVE READ - ACCESS FOR OTHER USERS!!! Use chmod 600 password-file. + Read passwords from a file. + + DO NOT FORGET TO REMOVE READ ACCESS FOR OTHER USERS!!! + Use chmod 600 password-file. All lines below should be valid Python tuples in the form (code, family, username, password) or (username, password) to set a default password for an username. Default usernames @@ -252,8 +257,8 @@ ("my_sysop_user", "my_sysop_password") ("en", "wikipedia", "my_en_user", "my_en_pass") """ - file = open(wikipedia.config.datafilepath(config.password_file), 'r') - for line in file: + password_f = open(wikipedia.config.datafilepath(config.password_file), 'r') + for line in password_f: if not line.strip(): continue entry = eval(line) if len(entry) == 2: #for default userinfo @@ -263,13 +268,16 @@ entry[1] == self.site.family.name and \ entry[2] == self.username: self.password = entry[3] - file.close() + password_f.close() def login(self, api = config.use_api_login, retry = False): if not self.password: # As we don't want the password to appear on the screen, we set # password = True - self.password = wikipedia.input(u'Password for user %s on %s:' % (self.username, self.site), password = True) + self.password = wikipedia.input( + u'Password for user %s on %s:' + % (self.username, self.site), + password = True) self.password = self.password.encode(self.site.encoding()) @@ -335,7 +343,8 @@ for arg in wikipedia.handleArgs(): if arg.startswith("-pass"): if len(arg) == 5: - password = wikipedia.input(u'Password for all accounts:', password = True) + password = wikipedia.input(u'Password for all accounts:', + password = True) else: password = arg[6:] elif arg == "-clean": Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/pagegenerators.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -15,26 +15,26 @@ """ __version__='$Id$' -parameterHelp = """\ +parameterHelp = u"""\ -cat Work on all pages which are in a specific category. Argument can also be given as "-cat:categoryname" or - as "-cat:categoryname#fromtitle" (using | instead of # + as "-cat:categoryname|fromtitle" (using # instead of | is also allowed in this one and the following) -catr Like -cat, but also recursively includes pages in subcategories, sub-subcategories etc. of the given category. Argument can also be given as "-catr:categoryname" or - as "-catr:categoryname#fromtitle". + as "-catr:categoryname|fromtitle". -subcats Work on all subcategories of a specific category. Argument can also be given as "-subcats:categoryname" or - as "-subcats:categoryname#fromtitle". + as "-subcats:categoryname|fromtitle". -subcatsr Like -subcats, but also includes sub-subcategories etc. of the given category. Argument can also be given as "-subcatsr:categoryname" or - as "-subcatsr:categoryname#fromtitle". + as "-subcatsr:categoryname|fromtitle". -uncat Work on all pages which are not categorised. @@ -50,22 +50,12 @@ -filelinks Work on all pages that use a certain image/media file. Argument can also be given as "-filelinks:filename". --yahoo Work on all pages that are found in a Yahoo search. - Depends on python module pYsearch. See yahoo_appid in - config.py for instructions. - -search Work on all pages that are found in a MediaWiki search across all namespaces. --google Work on all pages that are found in a Google search. - You need a Google Web API license key. Note that Google - doesn't give out license keys anymore. See google_key in - config.py for instructions. - Argument can also be given as "-google:searchstring". - --namespace Filters the page generator to only yield pages in the +-namespace Filter the page generator to only yield pages in the specified namespaces. Separate multiple namespace - numbers with commas. + numbers with commas. Example "-namespace:0,2,4" -interwiki Work on the given page and all equivalent pages in other languages. This can, for example, be used to fight @@ -77,15 +67,20 @@ -links Work on all pages that are linked from a certain page. Argument can also be given as "-links:linkingpagetitle". --new Work on the 60 newest pages. If given as -new:x, will work - on the x newest pages. - -imagelinks Work on all images that are linked from a certain page. Argument can also be given as "-imagelinks:linkingpagetitle". -newimages Work on the 100 newest images. If given as -newimages:x, will work on the x newest images. +-new Work on the 60 recent new pages. If given as -new:x, + will work on the x newest pages. + +-recentchanges Work on new and edited pages returned by + [[Special:Recentchanges]]. Can also be given as + "-recentchanges:n" where n is the number of pages to be + returned, else 100 pages are returned. + -ref Work on all pages that link to a certain page. Argument can also be given as "-ref:referredpagetitle". @@ -135,11 +130,6 @@ -gorandom Specifies that the robot should starting at the random pages returned by [[Special:Random]]. --recentchanges Work on new and edited pages returned by - [[Special:Recentchanges]]. Can also be given as - "-recentchanges:n" where n is the number of pages to be - returned, else 100 pages are returned. - -redirectonly Work on redirect pages only, not their target pages. The robot goes alphabetically through all redirect pages on the wiki, starting at the named page. The @@ -148,15 +138,24 @@ You can also include a namespace. For example, "-redirectonly:Template:!" will make the bot work on all redirect pages in the template namespace. + +-google Work on all pages that are found in a Google search. + You need a Google Web API license key. Note that Google + doesn't give out license keys anymore. See google_key in + config.py for instructions. + Argument can also be given as "-google:searchstring". + +-yahoo Work on all pages that are found in a Yahoo search. + Depends on python module pYsearch. See yahoo_appid in + config.py for instructions. """ +docuReplacements = {'&params;': parameterHelp} -docuReplacements = { - '&params;': parameterHelp -} + # Standard library imports import re, codecs, sys import threading, Queue, traceback @@ -309,9 +308,10 @@ yield page def InterwikiPageGenerator(page): + """Iterator over all interwiki (non-language) links on a page.""" yield page - for iwPage in page.interwiki(): - yield iwPage + for link in page.interwiki(): + yield link def ReferringPageGenerator(referredPage, followRedirects=False, withTemplateInclusion=True, @@ -333,9 +333,10 @@ If start is a string value, only pages whose title comes after start alphabetically are included. ''' - for page in category.articles(recurse = recurse, startFrom = start): - if page.title() >= start: - yield page + # TODO: page generator could be modified to use cmstartsortkey ... + for a in category.articles(recurse = recurse, startFrom = start): + if start is None or a.title() >= start: + yield a def SubCategoriesPageGenerator(category, recurse=False, start=None): ''' @@ -345,9 +346,12 @@ recurse is an int, only subcategories to that depth will be included (e.g., recurse=2 will get pages in subcats and sub-subcats, but will not go any further). + If start is a string value, only categories whose sortkey comes after + start alphabetically are included. ''' - for page in category.subcategories(recurse = recurse, startFrom = start): - yield page + # TODO: page generator could be modified to use cmstartsortkey ... + for s in category.subcategories(recurse = recurse, startFrom = start): + yield s def UnCategorizedCategoryGenerator(number = 100, repeat = False, site = None): if site is None: @@ -461,8 +465,8 @@ yield wikipedia.Page(site, title) f.close() -def PagesFromTitlesGenerator(iterable, site = None): - """Generates pages from the titles (unicode strings) yielded by iterable""" +def PagesFromTitlesGenerator(iterable, site=None): + """Generate pages from the titles (unicode strings) yielded by iterable.""" if site is None: site = wikipedia.getSite() for title in iterable: Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2010-01-13 07:10:29 UTC (rev 7873) +++ trunk/pywikipedia/userlib.py 2010-01-13 07:15:42 UTC (rev 7874) @@ -2,6 +2,11 @@ """ Library to work with users, their pages and talk pages. """ +# +# (C) Pywikipedia bot team, 2008-2010 +# +# Distributed under the terms of the MIT license. +# __version__ = '$Id$' import re

1 0

SVN: [7873] branches/rewrite/pywikibot
by xqt＠svn.wikimedia.org 13 Jan '10

13 Jan '10

Revision: 7873 Author: xqt Date: 2010-01-13 07:10:29 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Updates from trunk Modified Paths: -------------- branches/rewrite/pywikibot/date.py branches/rewrite/pywikibot/families/osm_family.py branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikinews_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wikisource_family.py branches/rewrite/pywikibot/families/wiktionary_family.py branches/rewrite/pywikibot/families/wowwiki_family.py branches/rewrite/pywikibot/family.py branches/rewrite/pywikibot/login.py branches/rewrite/pywikibot/pagegenerators.py Modified: branches/rewrite/pywikibot/date.py =================================================================== --- branches/rewrite/pywikibot/date.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/date.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -92,7 +92,7 @@ if pred(value): return func(value) - raise ValueError("could not find a matching function") + raise ValueError("could not find a matching function") # @@ -143,9 +143,8 @@ return dh_noConv( value, pattern, formatLimits['MillenniumAD'][0] ) def dh_millenniumBC( value, pattern ): return dh_noConv( value, pattern, formatLimits['MillenniumBC'][0] ) - - + def decSinglVal( v ): return v[0] @@ -176,7 +175,7 @@ def dh_singVal( value, match ): return dh_constVal( value, 0, match ) - + def dh_constVal( value, ind, match ): """This function helps with matching a single value to a constant. formats['CurrEvents']['en'](ind) => u'Current Events' @@ -246,12 +245,12 @@ 'X', 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI', 'XVII', 'XVIII', 'XIX', 'XX', 'XXI', 'XXII', 'XXIII', 'XXIV', 'XXV', 'XXVI', 'XXVII', 'XXVIII', 'XXVIX', 'XXX'] - + def intToRomanNum(i): if i >= len(_romanNumbers): raise IndexError(u'Roman value %i is not defined' % i) return _romanNumbers[i] - + def romanNumToInt(v): return _romanNumbers.index(v) @@ -266,13 +265,13 @@ # %K is a number in KN:: 'K' : ( _knDigits, lambda v: intToLocalDigitsStr(v, _knDigitsToLocal), lambda v: localDigitsStrToInt(v, _knDigitsToLocal, _knLocalToDigits) ), # %F is a number in FA: - 'F' : ( _faDigits, lambda v: intToLocalDigitsStr(v, _faDigitsToLocal), lambda v: localDigitsStrToInt(v, _faDigitsToLocal, _faLocalToDigits) ), + 'F' : ( _faDigits, lambda v: intToLocalDigitsStr(v, _faDigitsToLocal), lambda v: localDigitsStrToInt(v, _faDigitsToLocal, _faLocalToDigits) ), # %H is a number in HI: - 'H' : ( _hiDigits, lambda v: intToLocalDigitsStr(v, _hiDigitsToLocal), lambda v: localDigitsStrToInt(v, _hiDigitsToLocal, _hiLocalToDigits) ), + 'H' : ( _hiDigits, lambda v: intToLocalDigitsStr(v, _hiDigitsToLocal), lambda v: localDigitsStrToInt(v, _hiDigitsToLocal, _hiLocalToDigits) ), # %B is a number in BN: - 'B' : ( _bnDigits, lambda v: intToLocalDigitsStr(v, _bnDigitsToLocal), lambda v: localDigitsStrToInt(v, _bnDigitsToLocal, _bnLocalToDigits) ), + 'B' : ( _bnDigits, lambda v: intToLocalDigitsStr(v, _bnDigitsToLocal), lambda v: localDigitsStrToInt(v, _bnDigitsToLocal, _bnLocalToDigits) ), # %G is a number in GU: - 'G' : ( _guDigits, lambda v: intToLocalDigitsStr(v, _guDigitsToLocal), lambda v: localDigitsStrToInt(v, _guDigitsToLocal, _guLocalToDigits) ), + 'G' : ( _guDigits, lambda v: intToLocalDigitsStr(v, _guDigitsToLocal), lambda v: localDigitsStrToInt(v, _guDigitsToLocal, _guLocalToDigits) ), # %T is a year in TH: -- all years are shifted: 2005 => 'พ.ศ. 2548' 'T' : ( _decimalDigits, lambda v: unicode(v+543), lambda v: int(v)-543 ), } @@ -319,7 +318,7 @@ else: newPattern += re.escape( s ) strPattern += s - + newPattern += u'$' # end of the string compiledPattern = re.compile( newPattern ) _escPtrnCache2[pattern] = (compiledPattern, strPattern, decoders) @@ -341,7 +340,7 @@ decodingFunc: Converts a tuple/list of non-negative integers found in the original value string - into a normalized value. The normalized value can be passed right back into dh() + into a normalized value. The normalized value can be passed right back into dh() to produce the original string. This function is a complement of encodingFunc. dh() interprets %d as a decimal and %s as a roman numeral number. """ @@ -357,7 +356,7 @@ if decValue in _stringTypes: raise AssertionError("Decoder must not return a string!") - + # recursive call to re-encode and see if we get the original (may through filter exception) if value == dh(decValue, pattern, encf, decf, filter): return decValue @@ -368,9 +367,9 @@ # This will be called from outside as well as recursivelly to verify parsed value if filter and not filter(value): raise ValueError("value %i is not allowed" % value) - + params = encf(value) - + if type(params) in _listTypes: if len(params) != len(decoders): raise AssertionError("parameter count (%d) does not match decoder count (%d)" % (len(params), len(decoders))) @@ -382,7 +381,7 @@ raise AssertionError("A single parameter does not match %d decoders." % len(decoders)) # convert integer parameter into its textual representation return strPattern % MakeParameter(decoders[0], params) - + def MakeParameter( decoder, param ): newValue = decoder[1](param) if len(decoder) == 4 and len(newValue) < decoder[3]: @@ -413,7 +412,7 @@ 'als': lambda v: slh( v, [u"Januar", u"Februar", u"März", u"April", u"Mai", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), 'an' : lambda v: slh( v, [u"chinero", u"frebero", u"marzo", u"abril", u"mayo", u"chunio", u"chulio", u"agosto", u"setiembre", u"otubre", u"nobiembre", u"abiento"] ), 'ang': lambda v: slh( v, [u"Æfterra Gēola", u"Solmōnaþ", u"Hrēþmōnaþ", u"Ēastermōnaþ", u"Þrimilcemōnaþ", u"Sēremōnaþ", u"Mǣdmōnaþ", u"Wēodmōnaþ", u"Hāligmōnaþ", u"Winterfylleþ", u"Blōtmōnaþ", u"Gēolmōnaþ"] ), - 'ar' : lambda v: slh( v, [u"يناير", u"فبراير", u"مارس", u"إبريل", u"مايو", u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", u"أكتوبر", u"نوفمبر", u"ديسمبر"] ), + 'ar' : lambda v: slh( v, [u"يناير", u"فبراير", u"مارس", u"أبريل", u"مايو", u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", u"أكتوبر", u"نوفمبر", u"ديسمبر"] ), 'ast': lambda v: slh( v, [u"xineru", u"febreru", u"marzu", u"abril", u"mayu", u"xunu", u"xunetu", u"agostu", u"setiembre", u"ochobre", u"payares", u"avientu"] ), 'be' : lambda v: slh( v, [u"студзень", u"люты", u"сакавік", u"красавік", u"травень", u"чэрвень", u"ліпень", u"жнівень", u"верасень", u"кастрычнік", u"лістапад", u"сьнежань"] ), 'bg' : lambda v: slh( v, [u"януари", u"февруари", u"март", u"април", u"май", u"юни", u"юли", u"август", u"септември", u"октомври", u"ноември", u"декември"] ), @@ -458,6 +457,7 @@ 'ka' : lambda v: slh( v, [u"იანვარი", u"თებერვალი", u"მარტი", u"აპრილი", u"მაისი", u"ივნისი", u"ივლისი", u"აგვისტო", u"სექტემბერი", u"ოქტომბერი", u"ნოემბერი", u"დეკემბერი"] ), 'kn' : lambda v: slh( v, [u"ಜನವರಿ", u"ಫೆಬ್ರವರಿ", u"ಮಾರ್ಚಿ", u"ಎಪ್ರಿಲ್", u"ಮೇ", u"ಜೂನ", u"ಜುಲೈ", u"ಆಗಸ್ಟ್", u"ಸೆಪ್ಟೆಂಬರ್", u"ಅಕ್ಟೋಬರ್", u"ನವೆಂಬರ್", u"ಡಿಸೆಂಬರ್"] ), 'ko' : lambda v: slh( v, makeMonthList( u"%d월" )), + 'ksh': lambda v: slh( v, [u'Jannowaa', u'Febrowaa', u'Mä', u'Apprill', u'Meij', u'Juuni', u'Juuli', u'Aujuß', u'Sepptäber', u'Oktoober', u'Novemmber', u'Dezemmber'] ), 'ku' : lambda v: slh( v, [u"rêbendan", u"reşemî", u"adar", u"avrêl", u"gulan", u"pûşper", u"tîrmeh", u"gelawêj (meh)", u"rezber", u"kewçêr", u"sermawez", u"berfanbar"] ), 'kw' : lambda v: slh( v, [u"Mys Genver", u"Mys Whevrer", u"Mys Merth", u"Mys Ebrel", u"Mys Me", u"Mys Metheven", u"Mys Gortheren", u"Mys Est", u"Mys Gwyngala", u"Mys Hedra", u"Mys Du", u"Mys Kevardhu"] ), 'la' : lambda v: slh( v, [u"Ianuarius", u"Februarius", u"Martius", u"Aprilis", u"Maius", u"Iunius", u"Iulius", u"Augustus (mensis)", u"September", u"October", u"November", u"December"] ), @@ -465,6 +465,7 @@ 'li' : lambda v: slh( v, [u"jannewarie", u"fibberwarie", u"miert", u"april", u"mei", u"juni", u"juli", u"augustus (maond)", u"september", u"oktober", u"november", u"december"] ), 'lt' : lambda v: slh( v, [u"Sausis", u"Vasaris", u"Kovas", u"Balandis", u"Gegužė", u"Birželis", u"Liepa", u"Rugpjūtis", u"Rugsėjis", u"Spalis", u"Lapkritis", u"Gruodis"] ), 'lv' : lambda v: slh( v, [u"Janvāris", u"Februāris", u"Marts", u"Aprīlis", u"Maijs", u"Jūnijs", u"Jūlijs", u"Augusts", u"Septembris", u"Oktobris", u"Novembris", u"Decembris"] ), + 'mhr': lambda v: slh( v, [ u"шорыкйол", u"пургыж", u"ӱярня", u"вӱдшор", u"ага", u"пеледыш", u"сӱрем", u"сорла", u"идым", u"шыжа", u"кылме", u"декабрь"] ), 'mi' : lambda v: slh( v, [u"Kohi-tātea", u"Hui-tanguru", u"Poutū-te-rangi", u"Paenga-whāwhā", u"Haratua", u"Pipiri", u"Hōngongoi", u"Here-turi-kōkā", u"Mahuru", u"Whiringa-ā-nuku", u"Whiringa-ā-rangi", u"Hakihea"] ), 'ml' : lambda v: slh( v, [u"ജനുവരി", u"ഫെബ്രുവരി", u"മാര്ച്", u"ഏപ്രില്", u"മേയ്", u"ജൂണ്‍", u"ജൂലൈ", u"ആഗസ്റ്റ്‌", u"സപ്തന്പര്", u"ഒക്ടോബര്", u"നവന്പര്", u"ഡിസന്പര്"] ), 'mr' : lambda v: slh( v, [u"जानेवारी", u"फेब्रुवारी", u"मार्च", u"एप्रिल", u"मे", u"जून", u"जुलै", u"ऑगस्ट", u"सप्टेंबर", u"ऑक्टोबर", u"नोव्हेंबर", u"डिसेंबर"] ), @@ -512,6 +513,8 @@ 'ar' : lambda v: dh_number( v, u'%d (عدد)' ), 'be' : lambda v: dh_number( v, u'%d (лік)' ), 'bg' : lambda v: dh_number( v, u'%d (число)' ), + 'bs' : lambda v: dh_number( v, u'%d (broj)' ), + 'cs' : lambda v: dh_number( v, u'%d (číslo)' ), 'da' : lambda v: dh_number( v, u'%d (tal)' ), 'en' : lambda v: dh_number( v, u'%d (number)' ), 'fi' : lambda v: dh_number( v, u'%d (luku)' ), @@ -521,6 +524,7 @@ 'ia' : lambda v: dh_number( v, u'%d (numero)' ), 'ja' : lambda v: dh_number( v, u'%d' ), 'ko' : lambda v: dh_number( v, u'%d' ), + 'ksh': lambda v: dh_number( v, u'%d (Zahl)' ), 'la' : lambda v: dh_number( v, u'%d' ), 'lt' : lambda v: dh_number( v, u'%d (skaičius)' ), 'nds': lambda v: dh_number( v, u'%d (Tall)' ), @@ -579,7 +583,7 @@ 'gu' : lambda v: dh_yearAD( v, u'%G' ), 'he' : dh_simpleYearAD, 'hi' : lambda v: dh_yearAD( v, u'%H' ), - 'hr' : dh_simpleYearAD, + 'hr' : lambda v: dh_yearAD( v, u'%d.' ), 'hu' : dh_simpleYearAD, 'hy' : dh_simpleYearAD, 'ia' : dh_simpleYearAD, @@ -594,6 +598,7 @@ 'ka' : dh_simpleYearAD, 'kn' : lambda v: dh_yearAD( v, u'%K' ), 'ko' : lambda v: dh_yearAD( v, u'%d년' ), + 'ksh': lambda v: dh_yearAD( v, u'Joohr %d' ), 'ku' : dh_simpleYearAD, 'kw' : dh_simpleYearAD, 'la' : dh_simpleYearAD, @@ -602,6 +607,7 @@ 'lt' : dh_simpleYearAD, 'lv' : dh_simpleYearAD, 'mi' : dh_simpleYearAD, + 'mhr': dh_simpleYearAD, 'mk' : dh_simpleYearAD, 'ml' : dh_simpleYearAD, 'mo' : dh_simpleYearAD, @@ -620,7 +626,7 @@ 'rm' : dh_simpleYearAD, 'ro' : dh_simpleYearAD, 'roa-rup' : dh_simpleYearAD, - 'ru' : dh_simpleYearAD, + 'ru' : lambda v: dh_yearAD( v, u'%d год' ), 'sco': dh_simpleYearAD, 'scn': dh_simpleYearAD, 'se' : dh_simpleYearAD, @@ -647,6 +653,7 @@ 'uz' : dh_simpleYearAD, 'vec': dh_simpleYearAD, 'vi' : dh_simpleYearAD, + 'vo' : dh_simpleYearAD, 'wa' : dh_simpleYearAD, 'zh' : lambda v: dh_yearAD( v, u'%d年' ), 'zh-min-nan' : lambda v: dh_yearAD( v, u'%d nî' ), @@ -654,24 +661,27 @@ 'YearBC': { 'af' : lambda v: dh_yearBC( v, u'%d v.C.' ), + 'ast': lambda v: dh_yearBC( v, u'%d edC' ), 'be' : lambda v: dh_yearBC( v, u'%d да н.э.' ), 'bg' : lambda v: dh_yearBC( v, u'%d г. пр.н.е.' ), - 'bs' : lambda v: dh_yearBC( v, u'%d p.ne.' ), + 'bs' : lambda v: dh_yearBC( v, u'%d p.n.e.' ), 'ca' : lambda v: dh_yearBC( v, u'%d aC' ), 'cs' : lambda v: dh_yearBC( v, u'%d př. n. l.' ), + 'cy' : lambda v: dh_yearBC( v, u'%d CC' ), 'da' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), 'de' : lambda v: dh_yearBC( v, u'%d v. Chr.' ), + 'el' : lambda v: dh_yearBC( v, u'%d π.Χ.' ), 'en' : lambda v: dh_yearBC( v, u'%d BC' ), 'eo' : lambda v: dh_yearBC( v, u'-%d' ), - 'es' : lambda v: dh_yearBC( v, u'%d adC' ), + 'es' : lambda v: dh_yearBC( v, u'%d a. C.' ), 'et' : lambda v: dh_yearBC( v, u'%d eKr' ), 'eu' : lambda v: dh_yearBC( v, u'K. a. %d' ), - 'fi' : lambda v: dh_yearBC( v, u'%d eaa' ), + 'fi' : lambda v: dh_yearBC( v, u'%d eaa.' ), 'fo' : lambda v: dh_yearBC( v, u'%d f. Kr.' ), 'fr' : lambda v: dh_yearBC( v, u'-%d' ), 'gl' : lambda v: dh_yearBC( v, u'-%d' ), 'he' : lambda v: dh_yearBC( v, u'%d לפני הספירה' ), - 'hr' : lambda v: dh_yearBC( v, u'%d p.n.e.' ), + 'hr' : lambda v: dh_yearBC( v, u'%d. pr. Kr.' ), 'hu' : lambda v: dh_yearBC( v, u'I. e. %d' ), 'id' : lambda v: dh_yearBC( v, u'%d SM' ), 'io' : lambda v: dh_yearBC( v, u'%d aK' ), @@ -679,35 +689,45 @@ 'it' : lambda v: dh_yearBC( v, u'%d a.C.' ), 'ka' : lambda v: dh_yearBC( v, u'ძვ. წ. %d' ), 'ko' : lambda v: dh_yearBC( v, u'기원전 %d년' ), + 'ksh': lambda v: dh_yearBC( v,u'Joohr %d füür Krėßtůß'), 'la' : lambda v: dh_yearBC( v, u'%d a.C.n.' ), 'lb' : lambda v: dh_yearBC( v, u'-%d' ), + 'lt' : lambda v: dh_yearBC( v, u'%d m. pr. m. e.'), + 'lv' : lambda v: dh_yearBC( v, u'%d p.m.ē.'), + 'mk' : lambda v: dh_yearBC( v, u'%d п.н.е.'), 'ms' : lambda v: dh_yearBC( v, u'%d SM' ), 'nap': lambda v: dh_yearBC( v, u'%d AC' ), 'nds': lambda v: dh_yearBC( v, u'%d v. Chr.' ), 'nl' : lambda v: dh_yearBC( v, u'%d v.Chr.' ), 'nn' : lambda v: dh_yearBC( v, u'-%d' ), 'no' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), + 'oc' : lambda v: dh_yearBC( v, u'-%d' ), 'pl' : lambda v: dh_yearBC( v, u'%d p.n.e.' ), 'pt' : lambda v: dh_yearBC( v, u'%d a.C.' ), 'ro' : lambda v: dh_yearBC( v, u'%d î.Hr.' ), - 'ru' : lambda v: dh_yearBC( v, u'%d до н. э.' ), + 'ru' : lambda v: dh_yearBC( v, u'%d год до н. э.' ), 'scn': lambda v: dh_yearBC( v, u'%d a.C.' ), 'simple' : lambda v: dh_yearBC( v, u'%d BC' ), 'sk' : lambda v: dh_yearBC( v, u'%d pred Kr.' ), 'sl' : lambda v: dh_yearBC( v, u'%d pr. n. št.' ), 'sq' : lambda v: dh_yearBC( v, u'%d p.e.s.' ), - 'sr' : lambda v: dh_yearBC( v, u'%d. пне.' ), + 'sr' : lambda v: dh_yearBC( v, u'%d. п. н. е.' ), 'sv' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), + 'sw' : lambda v: dh_yearBC( v, u'%d KK' ), 'ta' : lambda v: dh_yearBC( v, u'கி.மு %d' ), + 'tr' : lambda v: dh_yearBC( v, u'M.Ö. %d' ), 'tt' : lambda v: dh_yearBC( v, u'MA %d' ), - 'uk' : lambda v: dh_yearBC( v, u'%d до Р.Х.' ), - 'uz' : lambda v: dh_yearBC( v, u'-%d' ), + 'uk' : lambda v: dh_yearBC( v, u'%d до н. е.' ), + 'uz' : lambda v: dh_yearBC( v, u'Mil. av. %d' ), 'vec': lambda v: dh_yearBC( v, u'%d a.C.' ), + 'vo' : lambda v: dh_yearBC( v, u'%d b.K.' ), 'zh' : lambda v: dh_yearBC( v, u'前%d年' ), }, 'DecadeAD': { 'als': lambda v: dh_decAD( v, u'%der' ), + 'ar' : lambda v: dh_decAD( v, u'%d عقد' ), + 'ast': lambda v: dh_decAD( v, u'Años %d' ), 'ang': lambda v: dh_decAD( v, u'%de' ), 'ast': lambda v: dh_decAD( v, u'Años %d' ), 'bg' : lambda v: dh_decAD( v, u'%d-те' ), @@ -719,6 +739,11 @@ (lambda v: dh_decAD( v, u'Dècada de %d' ), lambda p: p == 1970), (lambda v: dh_decAD( v, u'Dècada del %d' ), alwaysTrue)]), + #1970s => '1970-1979' + 'cs' : lambda m: multi( m, [ + (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), + (lambda v: dh( v, u'%d-%d', lambda i: (encDec0(i),encDec0(i)+9), decSinglVal ), alwaysTrue)]), + 'cy' : lambda v: dh_decAD( v, u'%dau' ), 'da' : lambda v: dh_decAD( v, u"%d'erne" ), 'de' : lambda v: dh_decAD( v, u'%der' ), @@ -727,7 +752,7 @@ 'eo' : lambda v: dh_decAD( v, u'%d-aj jaroj' ), 'es' : lambda v: dh_decAD( v, u'Años %d' ), 'et' : lambda v: dh_decAD( v, u'%d. aastad' ), - + # decades ending in 00 are spelled differently 'fi' : lambda m: multi( m, [ (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosikymmen'), lambda p: p == 0), @@ -736,14 +761,15 @@ 'fo' : lambda v: dh_decAD( v, u'%d-árini' ), 'fr' : lambda v: dh_decAD( v, u'Années %d' ), - 'ga' : lambda v: dh_decAD( v, u'%dí' ), + 'ga' : lambda v: dh_decAD( v, u'%didí' ), + 'gan': lambda v: dh_decAD( v, u'%d年代' ), 'he' : lambda m: multi( m, [ (lambda v: dh( v, u'שנות ה־%d', lambda i: encDec0(i)%100, lambda ii: 1900 + ii[0] ), lambda p: p >= 1900 and p < 2000), # This is a dummy value, just to avoid validation testing. (lambda v: dh_decAD( v, u'%dth decade' ), alwaysTrue)]), # ********** ERROR!!! 'hi' : lambda v: dh_decAD( v, u'%H का दशक' ), - + #1970s => 1970-1979 'hr' : lambda m: multi( m, [ (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), @@ -762,6 +788,7 @@ 'ja' : lambda v: dh_decAD( v, u'%d年代' ), 'ka' : lambda v: dh_decAD( v, u'%d-ები‎' ), 'ko' : lambda v: dh_decAD( v, u'%d년대' ), + 'ksh': lambda v: dh_decAD( v, u'%d-er Joohre' ), #1970s => 'Decennium 198' (1971-1980) 'la' : lambda v: dh( v, u'Decennium %d', lambda i: encDec1(i)/10+1, lambda ii: (ii[0]-1)*10 ), @@ -774,12 +801,14 @@ #1970s => 'Ngahurutanga 198' (1971-1980) 'mi' : lambda v: dh( v, u'Ngahurutanga %d', lambda i: encDec0(i)/10+1, lambda ii: (ii[0]-1)*10 ), + 'mhr': lambda v: dh_decAD( v, u'%d ийла' ), + #1970s => '1970-1979' 'nl' : lambda m: multi( m, [ (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), (lambda v: dh( v, u'%d-%d', lambda i: (encDec0(i),encDec0(i)+9), decSinglVal ), alwaysTrue)]), - 'nn' : lambda v: dh_decAD( v, u'%d0-åra' ), # FIXME: not sure of this one + 'nn' : lambda v: dh_decAD( v, u'%d0-åra' ), # FIXME: not sure of this one 'no' : lambda v: dh_decAD( v, u'%d-årene' ), 'os' : lambda v: dh_decAD( v, u'%d-тæ' ), @@ -798,7 +827,7 @@ 'ru' : lambda v: dh_decAD( v, u'%d-е' ), 'scn': lambda v: dh_decAD( v, u'%dini' ), 'simple' : lambda v: dh_decAD( v, u'%ds' ), - + # 1970 => '70. roky 20. storočia' 'sk' : lambda v: dh( v, u'%d. roky %d. storočia', lambda i: (encDec0(i)%100, encDec0(i)/100+1), @@ -834,9 +863,9 @@ # decades ending in 00 are spelled differently 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosikymmen eaa'), lambda p: p == 0), - (lambda v: dh_decBC( v, u'%d-luku eaa' ), lambda p: (p % 100 != 0)), - (lambda v: dh_decBC( v, u'%d-vuosikymmen eaa' ), alwaysTrue)]), + (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosikymmen eaa.'), lambda p: p == 0), + (lambda v: dh_decBC( v, u'%d-luku eaa.' ), lambda p: (p % 100 != 0)), + (lambda v: dh_decBC( v, u'%d-vuosikymmen eaa.' ), alwaysTrue)]), 'fr' : lambda v: dh_decBC( v, u'Années -%d' ), 'he' : lambda v: dh_decBC( v, u'שנות ה־%d לפני הספירה' ), @@ -850,6 +879,7 @@ 'it' : lambda v: dh_decBC( v, u'Anni %d a.C.' ), 'ka' : lambda v: dh_decBC( v, u'ძვ. წ. %d-ები' ), + 'ksh': lambda v: dh_decBC( v, u'%d-er Joohre füür Krėßtůß'), # uncertain if that's right. might go to redirect. # '19-10 v. Chr.' 'nl' : lambda m: multi( m, [ @@ -949,6 +979,7 @@ (lambda v: dh_centuryAD( v, u'%des kansblydhen' ), lambda p: p == 5), (lambda v: dh_centuryAD( v, u'%dns kansblydhen' ), lambda p: p >= 20), (lambda v: dh_centuryAD( v, u'%dves kansblydhen' ), alwaysTrue)]), + 'ksh': lambda v: dh_centuryAD( v, u'%d. Joohunndot'), 'la' : lambda v: dh_centuryAD( v, u'Saeculum %d' ), 'lb' : lambda v: dh_centuryAD( v, u'%d. Joerhonnert' ), @@ -960,7 +991,7 @@ 'mi' : lambda v: dh_centuryAD( v, u'Tua %d rau tau' ), 'mk' : lambda v: dh_centuryAD( v, u'%d век' ), 'nds': lambda v: dh_centuryAD( v, u'%d. Johrhunnert' ), - 'nl' : lambda v: dh_centuryAD( v, u'%de eeuw' ), + 'nl' : lambda v: dh_centuryAD( v, u'%de eeuw' ), 'nn' : lambda m: multi( m, [ (lambda v: dh_constVal( v, 1, u'1. århundret'), lambda p: p == 1), (lambda v: dh( v, u'%d00-talet', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), @@ -995,33 +1026,33 @@ 'CenturyBC': { 'af' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%dste eeu v.C.' ), lambda p: p in [1,8] or (p >= 20)), - (lambda v: dh_centuryBC( v, u'%dde eeu v.C.' ), alwaysTrue)]), + (lambda v: dh_centuryBC( v, u'%dste eeu v.C.' ), lambda p: p in [1,8] or (p >= 20)), + (lambda v: dh_centuryBC( v, u'%dde eeu v.C.' ), alwaysTrue)]), 'bg' : lambda v: dh_centuryBC( v, u'%d век пр.н.е.' ), - 'br' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Iañ kantved kt JK'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Eil kantved kt JK'), lambda p: p == 2), - (lambda v: dh_centuryBC( v, u'%Re kantved kt JK'), lambda p: p in [2,3]), - (lambda v: dh_centuryBC( v, u'%Rvet kantved kt JK'), alwaysTrue)]), + 'br' : lambda m: multi( m, [ + (lambda v: dh_constVal( v, 1, u'Iañ kantved kt JK'), lambda p: p == 1), + (lambda v: dh_constVal( v, 2, u'Eil kantved kt JK'), lambda p: p == 2), + (lambda v: dh_centuryBC( v, u'%Re kantved kt JK'), lambda p: p in [2,3]), + (lambda v: dh_centuryBC( v, u'%Rvet kantved kt JK'), alwaysTrue)]), 'ca' : lambda v: dh_centuryBC( v, u'Segle %R aC' ), 'cs' : lambda v: dh_centuryBC( v, u'%d. století př. n. l.' ), 'da' : lambda v: dh_centuryBC( v, u'%d. århundrede f.Kr.' ), 'de' : lambda v: dh_centuryBC( v, u'%d. Jahrhundert v. Chr.' ), 'el' : lambda v: dh_centuryBC( v, u'%dος αιώνας π.Χ.' ), 'en' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%dst century BC' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_centuryBC( v, u'%dnd century BC' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_centuryBC( v, u'%drd century BC' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_centuryBC( v, u'%dth century BC' ), alwaysTrue)]), + (lambda v: dh_centuryBC( v, u'%dst century BC' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), + (lambda v: dh_centuryBC( v, u'%dnd century BC' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), + (lambda v: dh_centuryBC( v, u'%drd century BC' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), + (lambda v: dh_centuryBC( v, u'%dth century BC' ), alwaysTrue)]), 'eo' : lambda v: dh_centuryBC( v, u'%d-a jarcento a.K.' ), 'es' : lambda v: dh_centuryBC( v, u'Siglo %R adC' ), 'et' : lambda v: dh_centuryBC( v, u'%d. aastatuhat eKr' ), 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata eaa'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-luku eaa', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), + (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata eaa.'), lambda p: p == 1), + (lambda v: dh( v, u'%d00-luku eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), 'fr' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%Rer siècle av. J.-C.' ), lambda p: p == 1), - (lambda v: dh_centuryBC( v, u'%Re siècle av. J.-C.' ), alwaysTrue)]), + (lambda v: dh_centuryBC( v, u'%Rer siècle av. J.-C.' ), lambda p: p == 1), + (lambda v: dh_centuryBC( v, u'%Re siècle av. J.-C.' ), alwaysTrue)]), 'he' : lambda v: dh_centuryBC( v, u'המאה ה־%d לפני הספירה' ), 'hr' : lambda v: dh_centuryBC( v, u'%d. stoljeće p.n.e.' ), 'id' : lambda v: dh_centuryBC( v, u'Abad ke-%d SM' ), @@ -1030,6 +1061,7 @@ 'ja' : lambda v: dh_centuryBC( v, u'紀元前%d世紀' ), 'ka' : lambda v: dh_centuryBC( v, u'ძვ. წ. %R საუკუნე' ), 'ko' : lambda v: dh_centuryBC( v, u'기원전 %d세기' ), + 'ksh': lambda v: dh_centuryBC( v, u'%d. Joohunndot füür Kreůßtůß'), # uncertain if that's right. might go to redirect. 'la' : lambda v: dh_centuryBC( v, u'Saeculum %d a.C.n.' ), 'lb' : lambda v: dh_centuryBC( v, u'%d. Joerhonnert v. Chr.' ), 'nl' : lambda v: dh_centuryBC( v, u'%de eeuw v.Chr.' ), @@ -1058,18 +1090,23 @@ }, 'CenturyAD_Cat':{ + 'cs' : lambda v: dh_centuryAD( v, u'%d. století' ), 'da' : lambda v: dh_centuryAD( v, u'%d. århundrede' ), 'no' : lambda v: dh( v, u'%d-tallet', lambda i: (i-1)*100, lambda ii: ii[0]/100+1 ), + 'ksh': lambda v: dh_constVal( v, 1, u'Joohunndot' ), }, - + 'CenturyBC_Cat':{ + 'cs' : lambda v: dh_centuryBC( v, u'%d. století př. n. l.' ), 'de' : lambda v: dh_centuryBC( v, u'Jahr (%d. Jh. v. Chr.)' ), 'no' : lambda v: dh( v, u'%d-tallet f.Kr.', lambda i: (i-1)*100, lambda ii: ii[0]/100+1 ), + 'ksh': lambda v: dh_constVal( v, 1, u'Joohunndot' ), }, - + 'MillenniumAD': { 'bg' : lambda v: dh_millenniumAD( v, u'%d хилядолетие' ), 'ca' : lambda v: dh_millenniumAD( v, u'Mil·lenni %R' ), + 'cs' : lambda v: dh_millenniumAD( v, u'%d. tisíciletí' ), 'de' : lambda v: dh_millenniumAD( v, u'%d. Jahrtausend' ), 'el' : lambda v: dh_millenniumAD( v, u'%dη χιλιετία' ), 'en' : lambda m: multi( m, [ @@ -1080,7 +1117,11 @@ 'es' : lambda v: dh_millenniumAD( v, u'%R milenio' ), 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosituhat'), lambda p: p == 0), + (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosituhat'), lambda p: p == 1), + (lambda v: dh_constVal( v, 2, u'Toinen vuosituhat'), lambda p: p == 2), + (lambda v: dh_constVal( v, 3, u'Kolmas vuosituhat'), lambda p: p == 3), + (lambda v: dh_constVal( v, 4, u'Neljäs vuosituhat'), lambda p: p == 4), + (lambda v: dh_constVal( v, 5, u'Viides vuosituhat'), lambda p: p == 5), (lambda v: dh( v, u'%d000-vuosituhat', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), 'fr' : lambda m: multi( m, [ @@ -1102,7 +1143,15 @@ 'it' : lambda v: dh_millenniumAD( v, u'%R millennio' ), 'ja' : lambda v: dh_millenniumAD( v, u'%d千年紀' ), 'ka' : lambda v: dh_millenniumAD( v, u'%R ათასწლეული' ), + 'ksh': lambda m: multi( m, [ + (lambda v: dh_constVal( v, 1, u'Eetße Johdousend'), lambda p: p == 1), + (lambda v: dh_constVal( v, 2, u'Zweijte Johdousend'), lambda p: p == 2), + (lambda v: dh_constVal( v, 3, u'Drette Johdousend'), lambda p: p == 3), + (lambda v: dh_constVal( v, 4, u'Veete Johdousend'), lambda p: p == 4), + (lambda v: dh_constVal( v, 5, u'Föfte Johdousend'), lambda p: p == 5), + (lambda v: dh_milleniumAD( v, u'%d. Johdousend'), alwaysTrue)]), 'lb' : lambda v: dh_millenniumAD( v, u'%d. Joerdausend' ), + 'mhr': lambda v: dh_millenniumAD( v, u'%R. курым — ' ), 'lt' : lambda v: dh_millenniumAD( v, u'%d tūkstantmetis' ), 'pt' : lambda v: slh( v, [u'Primeiro milénio d.C.', u'Segundo milénio d.C.', u'Terceiro milénio d.C.', u'Quarto milénio d.C.'] ), 'ro' : lambda v: slh( v, [u'Mileniul I', u'Mileniul al II-lea', u'Mileniul III'] ), @@ -1119,14 +1168,15 @@ 'MillenniumBC': { 'bg' : lambda v: dh_millenniumBC( v, u'%d хилядолетие пр.н.е.' ), 'ca' : lambda v: dh_millenniumBC( v, u'Mil·lenni %R aC' ), + 'cs' : lambda v: dh_millenniumBC( v, u'%d. tisíciletí př. n. l.' ), 'da' : lambda v: dh_millenniumBC( v, u'%d. årtusinde f.Kr.' ), 'de' : lambda v: dh_millenniumBC( v, u'%d. Jahrtausend v. Chr.' ), 'el' : lambda v: dh_millenniumBC( v, u'%dη χιλιετία π.Χ.' ), 'en' : lambda v: dh_millenniumBC( v, u'%dst millennium BC' ), 'es' : lambda v: dh_millenniumBC( v, u'%R milenio adC' ), 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosituhat eaa'), lambda p: p == 0), - (lambda v: dh( v, u'%d000-vuosituhat eaa', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), + (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosituhat eaa.'), lambda p: p == 1), + (lambda v: dh( v, u'%d000-vuosituhat eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), 'fr' : lambda v: dh_millenniumBC( v, u'%Rer millénaire av. J.-C.' ), 'he' : lambda m: multi( m, [ (lambda v: dh_millenniumAD( v, u'האלף הראשון %d לפני הספירה' ), lambda p: p == 1), @@ -1155,7 +1205,9 @@ }, 'Cat_Year_MusicAlbums': { + 'cs' : lambda v: dh_yearAD( v, u'Alba roku %d' ), 'en' : lambda v: dh_yearAD( v, u'%d albums' ), + 'fi' : lambda v: dh_yearAD( v, u'Vuoden %d albumit' ), 'fr' : lambda v: dh_yearAD( v, u'Album musical sorti en %d' ), 'he' : lambda v: dh_yearAD( v, u'אלבומי %d' ), 'pl' : lambda v: dh_yearAD( v, u'Albumy muzyczne wydane w roku %d' ), @@ -1170,7 +1222,7 @@ 'be' : lambda v: dh_singVal( v, u'Бягучыя падзеі' ), 'bg' : lambda v: dh_singVal( v, u'Текущи събития' ), 'ca' : lambda v: dh_singVal( v, u'Viquipèdia:Actualitat' ), - 'cs' : lambda v: dh_singVal( v, u'Aktuality' ), + 'cs' : lambda v: dh_singVal( v, u'Portál:Aktuality' ), 'da' : lambda v: dh_singVal( v, u'Aktuelle begivenheder' ), 'de' : lambda v: dh_singVal( v, u'Aktuelle Ereignisse' ), 'el' : lambda v: dh_singVal( v, u'Τρέχοντα γεγονότα' ), @@ -1190,6 +1242,7 @@ 'ja' : lambda v: dh_singVal( v, u'最近の出来事' ), 'ka' : lambda v: dh_singVal( v, u'ახალი ამბები' ), 'ko' : lambda v: dh_singVal( v, u'요즘 화제' ), + 'ksh': lambda v: dh_singVal( v, u'Et Neuste' ), 'ku' : lambda v: dh_singVal( v, u'Bûyerên rojane' ), 'la' : lambda v: dh_singVal( v, u'Novissima' ), 'lb' : lambda v: dh_singVal( v, u'Aktualitéit' ), @@ -1242,7 +1295,7 @@ raise AssertionError(u'pattern %s does not have 12 elements' % lang ) for i in range(12): - if patterns[i] != None: + if patterns[i] is not None: if isMnthOfYear: formats[yrMnthFmts[i]][lang] = eval(u'lambda v: dh_mnthOfYear( v, u"%s" )' % patterns[i]) else: @@ -1257,7 +1310,7 @@ The pattern must be have one %s that will be replaced by the localized month name. Use %%d for any other parameters that should be preserved. """ - if makeUpperCase == None: + if makeUpperCase is None: f = lambda s: s elif makeUpperCase == True: f = lambda s: s[0].upper() + s[1:] @@ -1278,7 +1331,7 @@ addFmt ('an', False, [ u"%d de chinero", u"%d de frebero", u"%d de marzo", u"%d d'abril", u"%d de mayo", u"%d de chunio", u"%d de chulio", u"%d d'agosto", u"%d de setiembre", u"%d d'otubre", u"%d de nobiembre", u"%d d'abiento" ]) #addFmt ('ang',False, [ u"%d Æfterra Gēola", u"%d Solmōnaþ", u"%d Hréþmónaþ", u"%d Éastermónaþ", u"%d Þrimilcemónaþ", u"%d Séremónaþ", u"%d Mǽdmónaþ", u"%d Wéodmónaþ", u"%d Háligmónaþ", u"%d Winterfylleþ", u"%d Blótmónaþ", u"%d Gēolmōnaþ" ]) addFmt2('ang',False, u"%%d %s", True ) -addFmt ('ar', False, [ u"%d يناير", u"%d فبراير", u"%d مارس", u"%d إبريل", u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", u"%d سبتمبر", u"%d اكتوبر", u"%d نوفمبر", u"%d ديسمبر" ]) +addFmt ('ar', False, [ u"%d يناير", u"%d فبراير", u"%d مارس", u"%d أبريل", u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", u"%d سبتمبر", u"%d أكتوبر", u"%d نوفمبر", u"%d ديسمبر" ]) addFmt ('ast',False, [ u"%d de xineru", u"%d de febreru", u"%d de marzu", u"%d d'abril", u"%d de mayu", u"%d de xunu", u"%d de xunetu", u"%d d'agostu", u"%d de setiembre", u"%d d'ochobre", u"%d de payares", u"%d d'avientu" ]) addFmt ('be', False, [ u"%d студзеня", u"%d лютага", u"%d сакавіка", u"%d красавіка", u"%d траўня", u"%d чэрвеня", u"%d ліпеня", u"%d жніўня", u"%d верасьня", u"%d кастрычніка", u"%d лістапада", u"%d сьнежня" ]) addFmt2('bg', False, u"%%d %s", False ) @@ -1326,6 +1379,7 @@ addFmt ('li', False, [ u"%d januari", u"%d februari", u"%d miert", u"%d april", u"%d mei", u"%d juni", u"%d juli", u"%d augustus", u"%d september", u"%d oktober", u"%d november", u"%d december" ]) addFmt ('lt', False, [ u"Sausio %d", u"Vasario %d", u"Kovo %d", u"Balandžio %d", u"Gegužės %d", u"Birželio %d", u"Liepos %d", u"Rugpjūčio %d", u"Rugsėjo %d", u"Spalio %d", u"Lapkričio %d", u"Gruodžio %d" ]) addFmt2('lv', False, u"%%d. %s", False ) +addFmt2('mhr',False, u"%%d %s", False ) addFmt ('mk', False, [ u"%d јануари", u"%d февруари", u"%d март", u"%d април", u"%d мај", u"%d јуни", u"%d јули", u"%d август", u"%d септември", u"%d октомври", u"%d ноември", u"%d декември" ]) addFmt2('ml', False, u"%s %%d" ) addFmt2('ms', False, u"%%d %s", True ) @@ -1353,7 +1407,7 @@ addFmt2('sv', False, u"%%d %s", False ) addFmt2('ta', False, u"%s %%d" ) addFmt2('te', False, u"%s %%d" ) -addFmt2('th', False, u"%%d %s" ) # %%T +addFmt2('th', False, u"%%d %s" ) # %%T addFmt2('tl', False, u"%s %%d" ) addFmt2('tr', False, u"%%d %s", True ) addFmt2('tt', False, u"%%d. %s", True ) @@ -1361,6 +1415,7 @@ addFmt ('ur', False, [ u"%d جنوری", u"%d فروری", u"%d مارچ", u"%d اپریل", u"%d مئ", u"%d جون", u"%d جلائ", u"%d اگست", u"%d ستمب", u"%d اکتوبر", u"%d نومب", u"%d دسمب" ]) addFmt2('vec',False, u"%%d de %s", False ) addFmt ('vi', False, makeMonthList( u"%%d tháng %d" )) +addFmt2('vo', False, u"%s %%d", False ) addFmt ('zh', False, makeMonthList( u"%d月%%d日" )) # Walloon names depend on the day number, thus we must generate various different patterns @@ -1402,7 +1457,7 @@ addFmt2('eo', True, u"%s de %%d" ) addFmt2('es', True, u"%s de %%d", True ) addFmt2('et', True, u"%s %%d", True ) -addFmt ('fi', True, [ None, None, None, None, None, u"Huhtikuu %d", None, None, None, None, None, None ]) +addFmt2('fi', True, u"%s %%d", True ) addFmt ('fr', True, [ u"Janvier %d", u"Février %d", u"Mars %d", u"Avril %d", u"Mai %d", u"Juin %d", u"Juillet %d", u"Août %d", u"Septembre %d", u"Octobre %d", u"Novembre %d", u"Décembre %d" ]) addFmt2('he', True, u"%s %%d", True ) addFmt2('it', True, u"Attualità/Anno %%d - %s", True ) @@ -1433,21 +1488,21 @@ # In addition, tuple contains start, end, and step values that will be used to test the formats table for internal consistency. # formatLimits = { - 'MonthName' : (lambda v: 1 <=v and v < 13, 1, 13), - 'Number' : (lambda v: 0 <=v and v < 1000000, 0, 1001), + 'MonthName' : (lambda v: 1 <=v and v < 13, 1, 13), + 'Number' : (lambda v: 0 <=v and v < 1000000, 0, 1001), - 'YearAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), - 'YearBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has years as old as 前1700年 - 'DecadeAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), # At some point need to re-add "and v%10==0" to the limitation - 'DecadeBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has decades as old as 前1700年代 - 'CenturyAD' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'CenturyBC' : (lambda v: 1 <=v and v < 91, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'MillenniumAD' : (lambda v: 1 <=v and v < 6, 1, 4), # For milleniums, only test first 3 AD Milleniums, - 'MillenniumBC' : (lambda v: 1 <=v and v < 20, 1, 2), # And only 1 BC Millenium + 'YearAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), + 'YearBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has years as old as 前1700年 + 'DecadeAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), # At some point need to re-add "and v%10==0" to the limitation + 'DecadeBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has decades as old as 前1700年代 + 'CenturyAD' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'CenturyBC' : (lambda v: 1 <=v and v < 91, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'MillenniumAD' : (lambda v: 1 <=v and v < 6, 1, 4), # For milleniums, only test first 3 AD Milleniums, + 'MillenniumBC' : (lambda v: 1 <=v and v < 20, 1, 2), # And only 1 BC Millenium 'CenturyAD_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing 'CenturyBC_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'Cat_Year_MusicAlbums' : (lambda v: 1950 <= v and v < 2021, 1950, 2021), - 'CurrEvents' : (lambda v: 0<= v and v < 1, 0, 1), + 'Cat_Year_MusicAlbums' : (lambda v: 1950 <= v and v < 2021, 1950, 2021), + 'CurrEvents' : (lambda v: 0 <= v and v < 1, 0, 1), } # All month of year articles are in the same format @@ -1468,7 +1523,7 @@ def getNumberOfDaysInMonth(month): """Returns the number of days in a given month, 1 being January, etc.""" - return formatLimits[dayMnthFmts[month - 1]][2] - 1 + return formatLimits[dayMnthFmts[month-1]][2]-1 def getAutoFormat( lang, title, ignoreFirstLetterCase = True ): @@ -1500,7 +1555,7 @@ self.site = site def __call__(self, m, d): - return formats['Day_' + enMonthNames[m - 1]][self.site.code](d) + return formats['Day_' + enMonthNames[m-1]][self.site.code](d) def formatYear(lang, year): @@ -1531,15 +1586,15 @@ >>> date.testMapEntry( 'DecadeAD', 1992, 1990 ) >>> date.testMapEntry( 'CenturyAD', 20, 20 ) """ - + step = 1 if formatName in decadeFormats: step = 10 predicate,start,stop = formatLimits[formatName] if value is not None: - start, stop = value, value + 1 + start, stop = value, value+1 if showAll: print(u"Processing %s with limits from %d to %d and step %d" % (formatName, start, stop - 1, step)) - + for code, convFunc in formats[formatName].iteritems(): # import time # startClock = time.clock() @@ -1560,21 +1615,21 @@ def test(quick = False, showAll = False): """This is a test function, to be used interactively to test entire format conversion map at once - + Usage example: run python interpreter >>> import date >>> date.test() - + """ for formatName in formats: - + if quick: testMapEntry( formatName, showAll, formatLimits[formatName][1] ) # Only test the first value in the test range else: testMapEntry( formatName, showAll ) # Extensive test! # Test decade rounding print(u"'%s' complete." % formatName) - + if quick: #print(u'Date module quick consistency test passed') pass @@ -1589,4 +1644,3 @@ # # test(quick=True) - Modified: branches/rewrite/pywikibot/families/osm_family.py =================================================================== --- branches/rewrite/pywikibot/families/osm_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/osm_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -19,4 +19,4 @@ return '' def version(self, code): - return "1.13.3" + return "1.13.3" \ No newline at end of file Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -15,9 +15,9 @@ 'he', 'sq', 'fi', 'ru', 'vi', 'cs', 'hr', 'zh', 'sv', 'da', 'ca', 'mk', 'tr', 'th', 'tl', 'sr', 'fa', 'id', 'is', 'ar', 'ta', 'no', 'simple', 'ka', 'ko', 'gl', 'eo', 'bg', 'lt', 'ro', - 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'et', 'sl', 'mr', 'ur', + 'sk', 'el', 'la', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'ur', 'uk', 'oc', 'ml', 'ms', 'eu', 'fy', 'ie', 'hi', 'tg', 'bn', - 'af', 'hy', 'bs', 'te', 'pa', 'ky', 'az', 'be', 'sa', 'ast', + 'af', 'hy', 'bs', 'te', 'pa', 'ky', 'az', 'sa', 'be', 'ast', 'zh-min-nan', 'tt', 'cy', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', 'als', 'su', 'uz', 'vo', 'na', 'kn', 'mn', 'kk', 'nds', 'za', 'zu', 'my', Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'sr', 'en', 'pl', 'de', 'it', 'fr', 'pt', 'es', 'zh', 'ja', 'sv', 'ru', 'nl', 'he', 'fi', 'ar', 'cs', 'sd', 'hu', 'no', - 'uk', 'ca', 'ta', 'ro', 'bg', 'tr', 'th', 'bs', + 'uk', 'ca', 'ta', 'bg', 'ro', 'tr', 'th', 'bs', ] for lang in self.languages_by_size: Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -14,30 +14,30 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'cs', 'tr', 'ro', 'ko', 'eo', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', - 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', + 'lt', 'bg', 'fa', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', - 'la', 'br', 'az', 'lb', 'bs', 'is', 'sh', 'mr', 'cy', 'sq', - 'lv', 'bpy', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'io', - 'be', 'an', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', - 'ku', 'ast', 'bat-smg', 'ur', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', + 'la', 'br', 'az', 'bs', 'lb', 'sh', 'is', 'mr', 'cy', 'sq', + 'lv', 'bpy', 'jv', 'tl', 'be-x-old', 'pms', 'bn', 'ta', 'oc', 'an', + 'io', 'be', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', + 'ku', 'ast', 'ur', 'bat-smg', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'kn', 'gd', 'uz', 'pam', 'lmo', - 'yi', 'mi', 'zh-min-nan', 'nah', 'hy', 'glk', 'hsb', 'co', 'kk', 'als', - 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'yo', 'arz', - 'fiu-vro', 'nds-nl', 'tk', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', + 'yi', 'hy', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'co', 'kk', 'sah', + 'als', 'li', 'roa-rup', 'ia', 'tt', 'yo', 'bcl', 'os', 'gan', 'arz', + 'fiu-vro', 'nds-nl', 'tk', 'vls', 'mn', 'sa', 'fo', 'am', 'nrm', 'dv', 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'se', 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'frp', 'sc', 'mg', 'ang', - 'kw', 'haw', 'pdc', 'szl', 'ps', 'hif', 'kv', 'ie', 'pa', 'to', + 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'sc', 'frp', 'mg', 'ang', + 'kw', 'pdc', 'haw', 'szl', 'ps', 'hif', 'kv', 'pa', 'ie', 'to', 'hak', 'bo', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', - 'mhr', 'wo', 'ext', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', - 'zea', 'srn', 'ay', 'ckb', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', - 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'ks', 'av', - 'tet', 'xal', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', - 'kl', 'pih', 'as', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', 'ti', - 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', 'ch', - 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', 'chy', - 'ak', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', 'ng', - 'pcd', + 'mhr', 'ext', 'wo', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', + 'zea', 'srn', 'ckb', 'ay', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', + 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'av', 'ks', + 'xal', 'tet', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', + 'kl', 'pih', 'as', 'pcd', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', + 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', + 'ch', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', + 'chy', 'ak', 'fj', 'sn', 'ff', 'lg', 'sg', 'lbe', 'rn', 'tum', + 'ng', ] for lang in self.languages_by_size: @@ -224,7 +224,7 @@ 'nv': [u'Dab'], 'nrm': [u'Page dé frouque'], 'oc': [u'Omonimia', u'Disambig'], - 'pl': [u'Disambig', u'DisambRulers', u'DisambigC', u'Strona ujednoznaczniająca'], + 'pl': [u'Disambig'], 'pms': [u'Gestion dij sinònim'], 'pt': [u'Desambiguação', u'Disambig', u'Desambig'], 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], @@ -248,6 +248,7 @@ 'su': [u'Disambig'], 'sv': None, 'sw': [u'Maana'], + 'szl': [u'Disambig'], 'ta': [u'பக்கவழி நெறிப்படுத்தல்'], 'te': [u'అయోమయ నివృత్తి', u'వివరమైన అయోమయ నివృత్తి'], 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], @@ -338,6 +339,7 @@ 'sr': u'Вишезначна одредница', 'su': u'Disambiguasi', 'sv': u'Förgreningssider', + 'szl': u'Zajty ujydnoznačńajůnce', 'th': u'การแก้ความกำกวม', 'tl': u'Paglilinaw', 'tr': u'Anlam ayrım', Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -15,8 +15,8 @@ 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'eo', 'fi', 'simple', 'hy', 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', - 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'eu', - 'az', 'vi', 'cy', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', + 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'az', + 'eu', 'vi', 'cy', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'zh-min-nan', 'mr', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', 'kk', 'am', 'co', ] Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -14,8 +14,8 @@ 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'he', 'it', 'ar', 'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', 'sl', 'ko', 'sr', 'uk', 'ja', 'el', 'la', 'li', - 'ml', 'vi', 'yi', 'az', 'bn', 'is', 'bs', 'ca', 'hy', 'id', - 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy', + 'vi', 'ml', 'yi', 'bn', 'az', 'is', 'bs', 'ca', 'hy', 'id', + 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -13,17 +13,17 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'el', 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'pt', 'ko', 'nl', - 'lo', 'ku', 'ja', 'ar', 'es', 'ro', 'kn', 'et', 'id', 'te', - 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'fa', 'is', 'li', 'sr', + 'lo', 'ku', 'ja', 'ar', 'es', 'kn', 'ro', 'et', 'id', 'te', + 'gl', 'bg', 'uk', 'ca', 'vo', 'ml', 'is', 'fa', 'li', 'sr', 'af', 'cs', 'sw', 'fy', 'scn', 'th', 'simple', 'br', 'oc', 'he', 'sl', 'hy', 'sq', 'tt', 'la', 'hr', 'zh-min-nan', 'da', 'ast', 'tk', 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'eo', 'ang', 'hi', 'ga', 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'ka', - 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'an', 'my', 'eu', - 'sh', 'gu', 'cy', 'ne', 'km', 'mg', 'lv', 'bn', 'ts', 'qu', - 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', 'ie', - 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'zu', 'si', 'pa', 'dv', - 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'jv', 'uz', 'ps', 'ik', + 'tl', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ne', 'cy', 'eu', + 'an', 'my', 'sh', 'gu', 'lv', 'mg', 'km', 'ps', 'bn', 'ts', + 'qu', 'bs', 'fo', 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', + 'ie', 'yi', 'be', 'iu', 'gd', 'tg', 'nn', 'zu', 'si', 'pa', + 'dv', 'mt', 'kw', 'gv', 'tpi', 'roa-rup', 'mi', 'jv', 'uz', 'ik', 'so', 'sg', 'ha', 'ss', 'sa', 'ay', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] Modified: branches/rewrite/pywikibot/families/wowwiki_family.py =================================================================== --- branches/rewrite/pywikibot/families/wowwiki_family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/families/wowwiki_family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -11,16 +11,17 @@ self.name = 'wowwiki' self.langs = { - 'en': 'www.wowwiki.com', 'cs': 'cs.wow.wikia.com', 'da': 'da.wowwiki.com', 'de': 'de.wow.wikia.com', 'el': 'el.wow.wikia.com', + 'en': 'www.wowwiki.com', 'es': 'es.wow.wikia.com', 'fa': 'fa.wow.wikia.com', 'fi': 'fi.wow.wikia.com', - 'fr': 'fr.wow.wikia.com', + 'fr': 'fr.wowwiki.com', 'he': 'he.wow.wikia.com', + 'hr': 'hr.wow.wikia.com', 'hu': 'hu.wow.wikia.com', 'is': 'is.wow.wikia.com', 'it': 'it.wow.wikia.com', @@ -29,15 +30,18 @@ 'lt': 'lt.wow.wikia.com', 'lv': 'lv.wow.wikia.com', 'nl': 'nl.wow.wikia.com', - 'nn': 'nn.wow.wikia.com', 'no': 'no.wow.wikia.com', 'pl': 'pl.wow.wikia.com', 'pt': 'pt.wow.wikia.com', 'pt-br': 'pt-br.wow.wikia.com', + 'ro': 'ro.wow.wikia.com', 'ru': 'ru.wow.wikia.com', 'sk': 'sk.wow.wikia.com', - 'zh': 'zh.wow.wikia.com', + 'sr': 'sr.wow.wikia.com', + 'sv': 'sv.warcraft.wikia.com', + 'tr': 'tr.wow.wikia.com', 'zh-tw': 'zh-tw.wow.wikia.com', + 'zh': 'zh.wow.wikia.com' } self.content_id = "article" Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/family.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -89,7 +89,7 @@ # for line in f.readlines(): # s = line[:line.index('\t')] # print ((" '%s':" % s).ljust(20) + ("'%s'," % s)) - + # TODO: replace this with API interwikimap call self.known_families = { 'abbenormal': 'abbenormal', @@ -657,7 +657,7 @@ else: raise KeyError( "ERROR: linktrail in language %(language_code)s unknown" - % {'language_code': code}) + % {'language_code': code}) def category_redirects(self, code, fallback="_default"): if code in self.category_redirect_templates: @@ -676,8 +676,8 @@ return self.disambiguationTemplates[fallback] else: raise KeyError( -"ERROR: title for disambig template in language %(language_code)s unknown" - % {'language_code': code}) + "ERROR: title for disambig template in language %(language_code)s unknown" + % {'language_code': code}) # Localised magic words for language code 'xyz' can be found in # the MediaWiki source code in the file Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/login.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -11,20 +11,22 @@ -all Try to log in on all sites where a username is defined in user-config.py. + + -force Ignores if the user is already logged in, and tries to log in. + -pass Useful in combination with -all when you have accounts for several sites and use the same password for all of them. Asks you for the password, then logs in on all given sites. - -pass:XXXX Uses XXXX as password. Be careful if you use this parameter - because your password will be shown on your screen, and will - probably be saved in your command line history. This is NOT - RECOMMENDED for use on computers where others have either - physical or remote access. Use -pass instead. + -pass:XXXX Uses XXXX as password. Be careful if you use this + parameter because your password will be shown on your + screen, and will probably be saved in your command line + history. This is NOT RECOMMENDED for use on computers + where others have either physical or remote access. + Use -pass instead. -sysop Log in with your sysop account. - -force Ignores if the user is already logged in, and tries to log in. - If not given as parameter, the script will ask for your username and password (password entry will be hidden), log in to your home wiki using this combination, and store the resulting cookies (containing your password @@ -38,7 +40,7 @@ """ # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikipedia bot team, 2003-2008 +# (C) Pywikipedia bot team, 2003-2010 # # Distributed under the terms of the MIT license. # @@ -104,11 +106,10 @@ self.readPassword() def botAllowed(self): - """Check whether the bot is listed on a specific page to comply with + """ + Checks whether the bot is listed on a specific page to comply with the policy on the respective wiki. - """ -# return True # DEBUG if self.site.family.name in botList \ and self.site.code in botList[self.site.family.name]: botListPageTitle = botList[self.site.family.name][self.site.code] @@ -129,7 +130,6 @@ captchaId A dictionary containing the captcha id and answer, if any Returns cookie data if succesful, None otherwise. - """ # NOT IMPLEMENTED - see data/api.py for implementation @@ -139,6 +139,7 @@ The argument data is the raw data, as returned by getCookie(). + Returns nothing. """ # THIS IS OVERRIDDEN IN data/api.py filename = config.datafilepath('pywikibot.lwp') @@ -148,33 +149,32 @@ f.close() def readPassword(self): - """Read passwords from a file. + """ + Read passwords from a file. - DO NOT FORGET TO REMOVE READ ACCESS FOR OTHER USERS!!! Use chmod 600 - password-file. All lines below should be valid Python tuples in the - form (code, family, username, password) or (username, password) to - set a default password for an username. Default usernames should - occur above specific usernames. + DO NOT FORGET TO REMOVE READ ACCESS FOR OTHER USERS!!! + Use chmod 600 password-file. + All lines below should be valid Python tuples in the form + (code, family, username, password) or (username, password) + to set a default password for an username. Default usernames + should occur above specific usernames. Example: ("my_username", "my_default_password") ("my_sysop_user", "my_sysop_password") ("en", "wikipedia", "my_en_user", "my_en_pass") - """ password_f = open(config.password_file) for line in password_f: - if not line.strip(): - continue + if not line.strip(): continue entry = eval(line) - if len(entry) == 2: - if entry[0] == self.username: - self.password = entry[1] - elif len(entry) == 4: + if len(entry) == 2: #for default userinfo + if entry[0] == self.username: self.password = entry[1] + elif len(entry) == 4: #for userinfo included code and family if entry[0] == self.site.code and \ - entry[1] == self.site.family.name and \ - entry[2] == self.username: + entry[1] == self.site.family.name and \ + entry[2] == self.username: self.password = entry[3] password_f.close() @@ -184,7 +184,7 @@ # password = True self.password = pywikibot.input( u'Password for user %(name)s on %(site)s:' - % {'name': self.username, 'site': self.site}, + % {'name': self.username, 'site': self.site}, password = True) # self.password = self.password.encode(self.site.encoding()) Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2010-01-12 17:52:07 UTC (rev 7872) +++ branches/rewrite/pywikibot/pagegenerators.py 2010-01-13 07:10:29 UTC (rev 7873) @@ -113,8 +113,6 @@ -prefixindex Work on pages commencing with a common prefix. --regex Obsolete, use -titleregex - -step:n When used with any other argument that specifies a set of pages, only retrieve n pages at a time from the wiki server @@ -576,7 +574,8 @@ def CategorizedPageGenerator(category, recurse=False, start=None, step=None, total=None): - '''Yield all pages in a specific category. + ''' + Yields all pages in a specific category. If recurse is True, pages in subcategories are included as well; if recurse is an int, only subcategories to that depth will be included @@ -584,8 +583,8 @@ not go any further). If start is a string value, only pages whose sortkey comes after start alphabetically are included. - - ''' # TODO: page generator could be modified to use cmstartsortkey ... + ''' + # TODO: page generator could be modified to use cmstartsortkey ... for a in category.articles(recurse=recurse, step=step, total=total): if start is None or a.title(withNamespace=False) >= start: yield a @@ -593,7 +592,8 @@ def SubCategoriesPageGenerator(category, recurse=False, start=None, step=None, total=None): - '''Yields all subcategories in a specific category. + ''' + Yields all subcategories in a specific category. If recurse is True, pages in subcategories are included as well; if recurse is an int, only subcategories to that depth will be included @@ -601,8 +601,8 @@ not go any further). If start is a string value, only categories whose sortkey comes after start alphabetically are included. - - ''' # TODO: page generator could be modified to use cmstartsortkey ... + ''' + # TODO: page generator could be modified to use cmstartsortkey ... for s in category.subcategories(recurse=recurse, step=step, total=total): if start is None or s.title(withNamespace=False) >= start: yield s @@ -638,7 +638,6 @@ yield pywikibot.Page(pywikibot.Link(linkmatch.groups("title"), site)) f.close() - def PagesFromTitlesGenerator(iterable, site=None): """Generate pages from the titles (unicode strings) yielded by iterable.""" if site is None:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn January 2010