Pywikipedia-svn November 2009

pywikipedia-svn@lists.wikimedia.org

9 participants
146 discussions

SVN: [7692] trunk/pywikipedia/welcome.py
by filnik＠svn.wikimedia.org 25 Nov '09

25 Nov '09

Revision: 7692 Author: filnik Date: 2009-11-25 13:47:03 +0000 (Wed, 25 Nov 2009) Log Message: ----------- Updating wiktionary settings Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-11-25 12:01:46 UTC (rev 7691) +++ trunk/pywikipedia/welcome.py 2009-11-25 13:47:03 UTC (rev 7692) @@ -287,7 +287,7 @@ 'zh': u'{{subst:welcome}} %s', }, 'wiktionary':{ - 'it': u'{{subst:Utente:Filnik/Benve|nome={{subst:PAGENAME}}}} %s', + 'it': u'{{subst:Utente:Filnik/Benve|firma=%s}}', }, 'wikiversity':{ 'de': u'{{subst:Willkommen|%s}}',

1 0

SVN: [7691] trunk/pywikipedia/userlib.py
by alexsh＠svn.wikimedia.org 25 Nov '09

25 Nov '09

Revision: 7691 Author: alexsh Date: 2009-11-25 12:01:46 +0000 (Wed, 25 Nov 2009) Log Message: ----------- cut bulk retrieve up if size > 500 Modified Paths: -------------- trunk/pywikipedia/userlib.py Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-11-24 17:04:42 UTC (rev 7690) +++ trunk/pywikipedia/userlib.py 2009-11-25 12:01:46 UTC (rev 7691) @@ -543,7 +543,19 @@ """ users = list(users) # if pages is an iterator, we need to make it a list if len(users) > 1: wikipedia.output(u'Getting %d users data from %s...' % (len(users), site)) - _GetAllUI(site, users, throttle, force).run() + + if len(users) > 500: + for urg in range(0, len(users), 500): + if urg == range(0, len(users), 500)[-1]: #latest + k = users[urg:] + _GetAllUI(site, k, throttle, force).run() + users[urg:] = k + else: + k = users[urg:urg + 500] + _GetAllUI(site, k, throttle, force).run() + users[urg:urg + 500] = k + else: + _GetAllUI(site, users, throttle, force).run() class _GetAllUI(object): def __init__(self, site, users, throttle, force): @@ -596,9 +608,7 @@ 'usprop': ['blockinfo', 'groups', 'editcount', 'registration', 'emailable', 'gender'], 'ususers': u'|'.join([n.name() for n in self.users]), } - for n in query.GetData(params, self.site)['query']['users']: - datas[n['name']] = n - return datas + return dict([(n['name'], n) for n in query.GetData(params, self.site)['query']['users']]) if __name__ == '__main__': """

1 0

SVN: [7690] trunk/pywikipedia/cosmetic_changes.py
by xqt＠svn.wikimedia.org 24 Nov '09

24 Nov '09

Revision: 7690 Author: xqt Date: 2009-11-24 17:04:42 +0000 (Tue, 24 Nov 2009) Log Message: ----------- Don't putSpacesInLists within <timeline /> (Do not break line comments) Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-11-24 11:05:07 UTC (rev 7689) +++ trunk/pywikipedia/cosmetic_changes.py 2009-11-24 17:04:42 UTC (rev 7690) @@ -443,8 +443,9 @@ and French Wikipedia. It might be that it is not wanted on other wikis. If there are any complaints, please file a bug report. """ + exceptions = ['comment', 'math', 'nowiki', 'pre', 'source', 'timeline'] if not self.redirect: - text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', ['comment', 'math', 'nowiki', 'pre', 'source']) + text = pywikibot.replaceExcept(text, r'(?m)^(?P<bullet>[:;]*(\*+|#+)[:;\*#]*)(?P<char>[^\s\*#:;].+?)', '\g<bullet> \g<char>', exceptions) return text #from fixes.py

1 0

SVN: [7689] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 24 Nov '09

24 Nov '09

Revision: 7689 Author: xqt Date: 2009-11-24 11:05:07 +0000 (Tue, 24 Nov 2009) Log Message: ----------- crossnamespace for ar/hr wiki Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-11-23 17:08:03 UTC (rev 7688) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-11-24 11:05:07 UTC (rev 7689) @@ -1055,6 +1055,7 @@ 'hr': { '_default': [0], 'als': [0, 104], + 'ar': [0, 104], 'es': [0, 104], 'fr': [0, 104], 'lt': [0, 104] @@ -1084,6 +1085,7 @@ }, 'ar': { '_default': [0, 100], + 'hr': [0, 102], 'pt': [0, 102], }, 'es': {

1 0

SVN: [7688] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7688 Author: xqt Date: 2009-11-23 17:08:03 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nv disambig template Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-11-23 16:14:36 UTC (rev 7687) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-11-23 17:08:03 UTC (rev 7688) @@ -755,6 +755,7 @@ 'no': [u'Peker', u'Etternavn', u'Disambig', u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], + 'nv': [u'Dab'], 'nrm': [u'Page dé frouque'], 'oc': [u'Omonimia', u'Disambig'], 'pl': [u'Disambig', u'DisambRulers', u'DisambigC', u'Strona ujednoznaczniająca'],

1 0

SVN: [7687] trunk/pywikipedia/generate_user_files.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7687 Author: xqt Date: 2009-11-23 16:14:36 +0000 (Mon, 23 Nov 2009) Log Message: ----------- small variant for user_config Modified Paths: -------------- trunk/pywikipedia/generate_user_files.py Modified: trunk/pywikipedia/generate_user_files.py =================================================================== --- trunk/pywikipedia/generate_user_files.py 2009-11-23 16:00:39 UTC (rev 7686) +++ trunk/pywikipedia/generate_user_files.py 2009-11-23 16:14:36 UTC (rev 7687) @@ -49,6 +49,10 @@ mylang = raw_input("The language code of the site we're working on (default: 'en'): ") or 'en' username = raw_input("Username (%s %s): " % (mylang, fam)) or 'UnnamedBot' username = unicode(username, console_encoding) + while True: + choice = raw_input("Which variant of user_config.py:\n[S]mall or [E]xtended (with further informations)? ").upper() + if choice in ['S','E']: + break # # I don't like this solution. Temporary for me. @@ -67,7 +71,8 @@ config_text = '\n'.join(res) f = codecs.open(_fnc, "w", "utf-8") - f.write("""# -*- coding: utf-8 -*- + if choice == 'E': + f.write("""# -*- coding: utf-8 -*- # This is an automatically generated file. You can find more configuration parameters in 'config.py' file. @@ -85,6 +90,12 @@ %s""" % (fam, mylang, fam, mylang, username, config_text)) + else: + f.write("""# -*- coding: utf-8 -*- +family = '%s' +mylang = '%s' +usernames['%s']['%s'] = u'%s' +""" % (fam, mylang, fam, mylang, username)) f.close() print("'%s' written." % _fnc)

1 0

SVN: [7686] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7686 Author: russblau Date: 2009-11-23 16:00:39 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Update family files from trunk. Modified Paths: -------------- branches/rewrite/pywikibot/families/commons_family.py branches/rewrite/pywikibot/families/meta_family.py branches/rewrite/pywikibot/families/species_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/family.py Added Paths: ----------- branches/rewrite/pywikibot/families/lockwiki_family.py Property Changed: ---------------- branches/rewrite/pywikibot/families/ branches/rewrite/pywikibot/family.py Property changes on: branches/rewrite/pywikibot/families ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/pywikipedia/families:5896-6197,6212-7548 + /trunk/pywikipedia/families:5896-6197,6212-7685 Modified: branches/rewrite/pywikibot/families/commons_family.py =================================================================== --- branches/rewrite/pywikibot/families/commons_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/commons_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -28,16 +28,21 @@ u'Catredir', u'Redirect category'), } - + self.disambiguationTemplates = { 'commons': [u'Disambig', u'Disambiguation', u'Razločitev', u'Begriffsklärung'] } - + self.disambcatname = { 'commons': u'Disambiguation' } + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'species', + ] + def version(self, code): return '1.16alpha-wmf' Copied: branches/rewrite/pywikibot/families/lockwiki_family.py (from rev 7685, trunk/pywikipedia/families/lockwiki_family.py) =================================================================== --- branches/rewrite/pywikibot/families/lockwiki_family.py (rev 0) +++ branches/rewrite/pywikibot/families/lockwiki_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- + +__version__ = '$Id$' + +import family + +# The locksmithwiki family + +class Family(family.Family): + def __init__(self): + family.Family.__init__(self) + self.name = 'lockwiki' + self.langs = { + 'en': 'www.locksmithwiki.com', + } + self.namespaces[4] = { + '_default': [u'Locksmith Wiki Knowledge Base', + self.namespaces[4]['_default']], # REQUIRED + } + self.namespaces[4] = { + '_default': [u'Locksmith Wiki Knowledge Base talk', + self.namespaces[5]['_default']], # REQUIRED + } + + def scriptpath(self, code): + return '/lockwiki' + + def version(self, code): + return '1.15.1' + + def nicepath(self, code): + return "%s/" % self.path(self, code) Modified: branches/rewrite/pywikibot/families/meta_family.py =================================================================== --- branches/rewrite/pywikibot/families/meta_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/meta_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -15,6 +15,10 @@ } self.interwiki_forward = 'wikipedia' self.cross_allowed = ['meta',] + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', + 'mediawiki', 'test', 'incubator', 'commons', 'species', + ] def version(self,code): return '1.16alpha-wmf' Modified: branches/rewrite/pywikibot/families/species_family.py =================================================================== --- branches/rewrite/pywikibot/families/species_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/species_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -14,6 +14,10 @@ 'species': 'species.wikimedia.org', } self.interwiki_forward = 'wikipedia' + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', + ] def version(self,code): return '1.16alpha-wmf' Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -11,15 +11,15 @@ self.name = 'wikibooks' self.languages_by_size = [ - 'en', 'de', 'fr', 'zh', 'no', 'hu', 'pt', 'ja', 'es', 'it', - 'nl', 'pl', 'sq', 'he', 'fi', 'vi', 'ru', 'cs', 'hr', 'da', - 'sv', 'mk', 'th', 'tr', 'sr', 'fa', 'tl', 'ca', 'id', 'is', - 'ta', 'ar', 'ko', 'eo', 'ka', 'simple', 'bg', 'gl', 'lt', 'ro', - 'sk', 'la', 'el', 'ia', 'ang', 'sl', 'et', 'mr', 'cv', 'ur', - 'oc', 'ml', 'ms', 'uk', 'eu', 'fy', 'ie', 'hi', 'tg', 'bn', - 'hy', 'af', 'az', 'te', 'pa', 'bs', 'ky', 'be', 'sa', 'zh-min-nan', - 'ast', 'cy', 'tt', 'mg', 'si', 'ku', 'co', 'tk', 'sw', 'ne', - 'als', 'su', 'uz', 'vo', 'na', 'kn', 'mn', 'kk', 'za', 'nds', + 'en', 'de', 'fr', 'hu', 'pt', 'ja', 'es', 'pl', 'nl', 'it', + 'he', 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'zh', 'sv', 'da', + 'mk', 'ca', 'tr', 'th', 'tl', 'sr', 'fa', 'id', 'is', 'ar', + 'ta', 'no', 'ka', 'simple', 'ko', 'eo', 'gl', 'bg', 'lt', 'ro', + 'sk', 'el', 'la', 'ia', 'ang', 'sl', 'et', 'cv', 'mr', 'ur', + 'oc', 'ml', 'ms', 'uk', 'eu', 'fy', 'hi', 'ie', 'bn', 'tg', + 'af', 'hy', 'te', 'pa', 'bs', 'ky', 'az', 'be', 'sa', 'zh-min-nan', + 'ast', 'tt', 'cy', 'mg', 'si', 'ku', 'co', 'sw', 'tk', 'ne', + 'als', 'su', 'vo', 'uz', 'na', 'kn', 'kk', 'mn', 'nds', 'za', 'zu', 'my', ] @@ -93,7 +93,12 @@ 'simple': alphabetic } # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… - self.cross_allowed = ['fa', 'fy', 'it', 'ru', 'simple', 'zh'] + self.cross_allowed = ['fa', 'fy', 'it', 'nl', 'ru', 'simple', 'zh'] + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikiquote', 'wikiquote', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' + ] def version(self, code): return '1.16alpha-wmf' Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -11,9 +11,9 @@ self.name = 'wikinews' self.languages_by_size = [ - 'en', 'sr', 'pl', 'it', 'de', 'fr', 'pt', 'es', 'zh', 'sv', - 'ja', 'ru', 'nl', 'he', 'fi', 'ar', 'sd', 'cs', 'no', 'uk', - 'hu', 'ca', 'ro', 'th', 'bs', 'bg', 'ta', 'tr' + 'sr', 'en', 'pl', 'de', 'it', 'fr', 'pt', 'es', 'zh', 'ja', + 'sv', 'ru', 'nl', 'he', 'fi', 'ar', 'cs', 'sd', 'no', 'hu', + 'uk', 'ca', 'ro', 'ta', 'tr', 'bg', 'th', 'bs', ] for lang in self.languages_by_size: @@ -42,6 +42,11 @@ # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = ['cs', 'hu',] + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' + ] def code2encoding(self, code): return 'utf-8' Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -12,31 +12,31 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'pl', 'ja', 'it', 'nl', 'es', 'pt', 'ru', - 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'tr', 'cs', 'ro', - 'vo', 'eo', 'da', 'sk', 'id', 'ko', 'ar', 'vi', 'he', 'lt', - 'sr', 'sl', 'bg', 'et', 'fa', 'hr', 'simple', 'new', 'ht', 'nn', - 'gl', 'th', 'ms', 'el', 'te', 'eu', 'ceb', 'hi', 'mk', 'ka', - 'la', 'br', 'bs', 'lb', 'is', 'az', 'cy', 'sq', 'mr', 'sh', - 'bpy', 'lv', 'tl', 'pms', 'be-x-old', 'jv', 'bn', 'oc', 'ta', 'io', - 'be', 'an', 'scn', 'nds', 'su', 'nap', 'ku', 'sw', 'af', 'fy', - 'ast', 'zh-yue', 'bat-smg', 'wa', 'war', 'ur', 'qu', 'ml', 'ksh', 'cv', - 'tg', 'ga', 'vec', 'roa-tara', 'gu', 'gd', 'uz', 'pam', 'kn', 'yi', - 'mi', 'lmo', 'yo', 'zh-min-nan', 'nah', 'glk', 'co', 'hsb', 'roa-rup', 'kk', - 'als', 'ia', 'li', 'hy', 'sah', 'bcl', 'gan', 'tt', 'tk', 'sa', - 'nds-nl', 'wuu', 'os', 'fo', 'vls', 'arz', 'fiu-vro', 'nrm', 'am', 'pag', - 'rm', 'map-bms', 'dv', 'mn', 'gv', 'se', 'diq', 'fur', 'ne', 'sco', - 'bar', 'lij', 'nov', 'bh', 'mt', 'ilo', 'pi', 'mzn', 'zh-classical', 'csb', - 'ug', 'km', 'frp', 'lad', 'si', 'kw', 'ang', 'sc', 'pdc', 'haw', - 'mg', 'to', 'kv', 'my', 'szl', 'pa', 'ps', 'myv', 'ie', 'gn', - 'hif', 'ln', 'stq', 'jbo', 'wo', 'arc', 'crh', 'tpi', 'ty', 'ext', - 'cbk-zam', 'ky', 'hak', 'eml', 'zea', 'srn', 'ay', 'pap', 'so', 'kg', - 'ig', 'or', 'kab', 'lo', 'udm', 'rmy', 'ba', 'dsb', 'ce', 'sm', - 'av', 'nv', 'cu', 'ks', 'tet', 'got', 'kaa', 'bo', 'sd', 'mdf', - 'iu', 'na', 'bm', 'as', 'cdo', 'kl', 'pnt', 'chr', 'ee', 'om', - 'pih', 'ab', 'zu', 'ti', 'ts', 'ss', 'za', 'bi', 'ha', 'cr', - 'dz', 'xal', 've', 'ch', 'xh', 'tn', 'bug', 'ik', 'bxr', 'rw', - 'st', 'tw', 'chy', 'ak', 'fj', 'ny', 'ff', 'sn', 'sg', 'lbe', - 'lg', 'rn', 'ki', 'tum', 'ng', 'mhr', 'ckb', 'pnb', 'mwl', 'ace' + 'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'hu', 'cs', 'tr', 'ro', + 'eo', 'ko', 'da', 'vo', 'id', 'sk', 'ar', 'vi', 'sr', 'he', + 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'simple', 'new', 'ms', 'th', + 'gl', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', + 'la', 'br', 'az', 'bs', 'lb', 'is', 'sh', 'mr', 'cy', 'sq', + 'lv', 'tl', 'bpy', 'be-x-old', 'pms', 'jv', 'bn', 'oc', 'ta', 'io', + 'be', 'an', 'nds', 'scn', 'sw', 'su', 'fy', 'af', 'nap', 'ku', + 'ast', 'bat-smg', 'zh-yue', 'ur', 'ml', 'wa', 'gu', 'qu', 'war', 'cv', + 'ksh', 'ga', 'tg', 'vec', 'roa-tara', 'gd', 'kn', 'uz', 'pam', 'lmo', + 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'kk', 'co', 'roa-rup', 'als', + 'hy', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'nds-nl', 'tk', + 'sa', 'fiu-vro', 'fo', 'arz', 'vls', 'mn', 'am', 'nrm', 'dv', 'pag', + 'rm', 'map-bms', 'wuu', 'gv', 'ne', 'bar', 'se', 'sco', 'diq', 'fur', + 'my', 'lij', 'pnb', 'nov', 'mt', 'yo', 'bh', 'mzn', 'ilo', 'csb', + 'pi', 'zh-classical', 'ug', 'km', 'lad', 'si', 'frp', 'sc', 'ang', 'mg', + 'kw', 'haw', 'pdc', 'ps', 'szl', 'kv', 'to', 'pa', 'ie', 'hif', + 'hak', 'myv', 'gn', 'bo', 'ln', 'stq', 'crh', 'jbo', 'arc', 'wo', + 'nv', 'ext', 'ky', 'tpi', 'ty', 'cbk-zam', 'mhr', 'eml', 'zea', 'srn', + 'ay', 'pap', 'so', 'ig', 'kg', 'or', 'kab', 'ckb', 'lo', 'ace', + 'udm', 'ba', 'rmy', 'dsb', 'kaa', 'ce', 'sm', 'ks', 'av', 'cu', + 'tet', 'got', 'sd', 'mdf', 'iu', 'na', 'bm', 'kl', 'ab', 'pih', + 'as', 'pnt', 'cdo', 'chr', 'mwl', 'ee', 'om', 'xal', 'zu', 'ti', + 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'ch', 'bxr', + 'bug', 'xh', 'tn', 'ki', 'rw', 'ik', 'st', 'tw', 'ny', 'chy', + 'ak', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', 'ng', ] for lang in self.languages_by_size: @@ -94,6 +94,7 @@ u'Category redirect', u'Catredirect',), 'simple': (u"Category redirect", + u"Categoryredirect", u"Catredirect",), 'sq': (u'Kategori e zhvendosur', u'Category redirect',), @@ -140,10 +141,11 @@ 'be-x-old': [u'Неадназначнасць', u'Неадназначнасьць', u'Disambig'], 'bg': [u'Пояснение', u'Disambig'], 'bn': [u'দ্ব্যর্থতা নিরসন', u'Disambig'], - 'br': [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez'], + 'br': [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez', + u"Digejañ lec'hanvioù"], 'bs': [u'Čvor'], 'ca': [u'Desambiguació', u'Disambig', u'Desambigua', - u'acrònim', u'onomàstica'], + u'acrònim', u'onomàstica', u'DesambigCurta'], 'ceb': [u'Giklaro'], 'cdo': [u'Gì-ngiê'], 'crh': [u'Çoq manalı', u'Disambig'], @@ -188,7 +190,8 @@ 'io': [u'Homonimo', u'Disambig'], 'is': None, 'it': [u'Disambigua', u'Sigla2', u'Sigla3', u'Sigla4', u'Cogni'], - 'ja': [u'Aimai', u'Dab', u'曖昧さ回避', u'Disambig'], + 'ja': [u'Aimai', u'Dab', u'曖昧さ回避', u'Disambig', u'地名の曖昧さ回避|あはていん', + u'地名の曖昧さ回避', u'人名の曖昧さ回避', u'人名の曖昧さ回避|あたるへると'], 'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'], 'kab': [u'Asefham'], 'kg': [u'Bisongidila'], @@ -198,7 +201,7 @@ 'kw': [u'Klerheans'], 'ksh': [u'Disambig'], 'la': [u'Discretiva', u'Disnomen'], - 'lb': [u'Homonymie', u'Disambig'], + 'lb': [u'Homonymie', u'Disambig', u'Homonymie Ofkierzungen'], 'li': [u'Verdudeliking', u'Verdudelikingpazjena', u'Vp'], 'lmo': [u'Desambiguació'], 'ln': [u'Bokokani'], @@ -213,7 +216,7 @@ 'nds': [u'Mehrdüdig Begreep', 'Disambig'], 'nds-nl': [u'Dv'], 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen'], - 'nn': [u'Fleirtyding'], + 'nn': [u'Fleirtyding', u'Tobokstavforkorting'], 'no': [u'Peker', u'Etternavn', u'Disambig', u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], @@ -237,7 +240,7 @@ 'sl': None, 'sq': [u'Kthjellim', u'Disambig'], 'sr': [u'Вишезначна одредница', u'Disambig', u'Вишезначна', - u'Višeznačna odrednica'], + u'Višeznačna odrednica', u'Взо'], 'srn': [u'Dp'], 'stq': [u'Begriepskläärenge'], 'su': [u'Disambig'], @@ -263,7 +266,7 @@ 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'dp', u'Deurverwiespagina'], - 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義'], + 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義', u'Letter disambig'], 'zh-classical': [u'Disambig', u'釋義', u'消歧義'], 'zh-min-nan': [u'Khu-pia̍t-ia̍h', 'KhPI', u'Disambig'], 'zh-yue': [u'搞清楚', u'Disambig'], @@ -345,10 +348,15 @@ 'zh-min-nan': u'Khu-pia̍t-ia̍h', } + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species', + ] # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = [ - 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang', 'arc', 'arz', 'as', 'ast', 'av', 'ay', 'az', - 'ba', 'bar', 'bcl', 'be-x-old', 'be', 'bg', 'bh', 'bi', 'bm', 'bo', 'bpy', 'bug', 'bxr', + 'ab', 'ace', 'af', 'ak', 'als', 'am', 'an', 'ang', 'arc', 'arz', 'as', 'ast', 'av', 'ay', 'az', + 'ba', 'bat-smg', 'bar', 'bcl', 'be-x-old', 'be', 'bg', 'bh', 'bi', 'bm', 'bo', 'bpy', 'bug', 'bxr', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cu', 'cv', 'cy', 'diq', 'dsb', 'dz', 'ee', 'el', 'eml', 'eo', 'et', 'eu', 'ext', 'fa', 'ff', 'fj', 'fo', 'frp', 'fur', 'ga', 'gan', 'gd', 'glk', 'gn', 'got', 'gu', 'gv', 'ha', 'hak', 'haw', 'hif', 'hi', 'hr', 'hsb', 'ht', 'hu', 'hy', @@ -357,7 +365,7 @@ 'lad', 'lb', 'lbe', 'lg', 'li', 'lij', 'lmo', 'ln', 'lo', 'lv', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'mk', 'mn', 'ms', 'mt', 'mwl', 'myv', 'my', 'mzn', 'nah', 'na', 'nap', 'nds-nl', 'ne', 'new', 'ng', 'nl', 'nov', 'nrm', 'nv', 'ny', 'oc', 'om', 'or', 'os', - 'pam', 'pap', 'pa', 'pag', 'pdc', 'pi', 'pms', 'pnb', 'pnt', 'ps', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'rw', + 'pam', 'pap', 'pa', 'pag', 'pdc', 'pi', 'pih', 'pms', 'pnb', 'pnt', 'ps', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'rw', 'sah', 'sa', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sm', 'sn', 'so', 'srn', 'stq', 'st', 'su', 'sw', 'szl', 'ta', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'ts', 'tt', 'tum', 'tw', 'ty', 'udm', 'ug', 'uz', 've', 'vls', 'wa', 'war', 'wo', 'wuu', @@ -503,6 +511,7 @@ 'pt': { '_default': [0], 'als': [0, 104], + 'ar': [0, 104], 'es': [0, 104], 'fr': [0, 104], 'lt': [0, 104] @@ -539,6 +548,7 @@ }, 'ar': { '_default': [0, 100], + 'pt': [0, 102], }, 'es': { '_default': [0], Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -11,14 +11,14 @@ self.name = 'wikiquote' self.languages_by_size = [ - 'en', 'it', 'de', 'pl', 'pt', 'sk', 'ru', 'es', 'bg', 'bs', - 'sl', 'tr', 'he', 'lt', 'fr', 'cs', 'zh', 'fa', 'hu', 'uk', - 'id', 'sv', 'el', 'no', 'nl', 'ja', 'fi', 'eo', 'hy', 'et', - 'nn', 'ca', 'simple', 'ka', 'ar', 'ku', 'ko', 'hr', 'ro', 'gl', - 'sr', 'ml', 'li', 'is', 'th', 'af', 'te', 'da', 'sq', 'vi', - 'eu', 'az', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ang', 'zh-min-nan', - 'lb', 'mr', 'gu', 'su', 'ur', 'ta', 'wo', 'kn', 'ky', 'cy', - 'am', 'co', 'kk', + 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', + 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', + 'uk', 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'simple', 'hy', 'eo', + 'et', 'nn', 'ca', 'ka', 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', + 'sr', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'sq', 'eu', + 'az', 'vi', 'la', 'cy', 'br', 'hi', 'be', 'ast', 'uz', 'ta', + 'ang', 'zh-min-nan', 'mr', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', + 'am', 'kk', 'co', ] for lang in self.languages_by_size: @@ -47,9 +47,14 @@ # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = [ - 'af','am','ang','ar','ast','az','ca','da','fa','it', - 'ka','ko','la','nn','no','ro','simple','sv','vi','zh' + 'af','am','ang','ar','ast','az','bg','bs','ca','cs','da','el','es','eu','fa','fr','fi','he','hu','hy','id','it', + 'ka','ko','la','lt','nl','nn','no','pt','ro','simple','sv','vi','zh' ] + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikisource', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' + ] # Which languages have a special order for putting interlanguage links, # and what order is it? If a language is not in interwiki_putfirst, # alphabetical order on language code is used. For languages that are in Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -11,11 +11,11 @@ self.name = 'wikisource' self.languages_by_size = [ - 'en', 'pt', 'fr', 'zh', 'es', 'de', 'ru', 'he', 'it', 'ar', + 'en', 'pt', 'ru', 'zh', 'fr', 'es', 'de', 'he', 'it', 'ar', 'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', - 'nl', 'sv', 'sl', 'ko', 'sr', 'ja', 'la', 'uk', 'el', 'li', - 'ml', 'is', 'bs', 'id', 'ca', 'bn', 'az', 'yi', 'hy', 'mk', - 'no', 'da', 'vi', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy', + 'nl', 'sv', 'sl', 'ko', 'sr', 'uk', 'ja', 'el', 'la', 'li', + 'yi', 'ml', 'az', 'is', 'bn', 'bs', 'ca', 'vi', 'id', 'hy', + 'mk', 'no', 'da', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy', 'sk', 'zh-min-nan', 'fo', ] @@ -53,8 +53,13 @@ } # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = [ - 'el','fa','it','ko','no','zh' + 'el','fa','it','ko','no','vi','zh' ] + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wikipedia', 'wiktionary', 'wikibooks', 'wikiquote', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' + ] def version(self, code): return '1.16alpha-wmf' Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -11,20 +11,20 @@ self.name = 'wiktionary' self.languages_by_size = [ - 'fr', 'en', 'tr', 'lt', 'vi', 'ru', 'io', 'zh', 'el', 'pl', - 'fi', 'no', 'hu', 'it', 'ta', 'sv', 'de', 'ko', 'lo', 'pt', - 'nl', 'ku', 'ja', 'es', 'id', 'te', 'ro', 'et', 'gl', 'bg', - 'ca', 'ar', 'vo', 'uk', 'fa', 'is', 'sr', 'af', 'sw', 'scn', - 'fy', 'th', 'br', 'oc', 'simple', 'li', 'cs', 'he', 'sl', 'hy', - 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'ast', 'tk', 'ur', 'wa', 'hsb', - 'kk', 'ml', 'ky', 'hr', 'wo', 'kn', 'ang', 'eo', 'hi', 'gn', - 'ga', 'ia', 'az', 'co', 'sk', 'csb', 'st', 'ms', 'nds', 'kl', - 'sd', 'ug', 'ti', 'tl', 'mk', 'ka', 'an', 'my', 'gu', 'km', - 'lv', 'cy', 'ts', 'qu', 'eu', 'fo', 'bs', 'am', 'rw', 'mr', - 'su', 'chr', 'mn', 'nah', 'om', 'ie', 'yi', 'be', 'iu', 'mg', - 'sh', 'gd', 'nn', 'bn', 'zu', 'si', 'pa', 'mt', 'dv', 'tpi', - 'mi', 'roa-rup', 'jv', 'tg', 'ps', 'ik', 'so', 'uz', 'ha', 'gv', - 'ss', 'kw', 'sa', 'ay', 'na', 'jbo', 'ne', 'tn', 'sm', 'sg', + 'fr', 'en', 'lt', 'tr', 'vi', 'ru', 'zh', 'io', 'pl', 'el', + 'fi', 'hu', 'no', 'it', 'ta', 'de', 'sv', 'ko', 'pt', 'nl', + 'lo', 'ku', 'ja', 'es', 'ro', 'id', 'te', 'et', 'gl', 'bg', + 'uk', 'ca', 'ar', 'kn', 'vo', 'ml', 'fa', 'is', 'sr', 'af', + 'li', 'sw', 'cs', 'scn', 'fy', 'th', 'simple', 'br', 'oc', 'he', + 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'hr', 'ast', 'tk', + 'wa', 'ur', 'hsb', 'kk', 'ky', 'wo', 'ang', 'eo', 'hi', 'ga', + 'gn', 'az', 'ia', 'co', 'sk', 'csb', 'st', 'ms', 'mr', 'tl', + 'ka', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'an', 'my', 'gu', + 'km', 'lv', 'eu', 'cy', 'mg', 'ts', 'qu', 'sh', 'bs', 'fo', + 'am', 'rw', 'chr', 'su', 'mn', 'om', 'nah', 'bn', 'ie', 'yi', + 'be', 'iu', 'gd', 'nn', 'zu', 'si', 'tg', 'pa', 'mt', 'dv', + 'tpi', 'roa-rup', 'mi', 'jv', 'kw', 'ps', 'uz', 'ik', 'so', 'gv', + 'sg', 'ha', 'ss', 'sa', 'ay', 'na', 'jbo', 'ne', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] @@ -38,9 +38,14 @@ # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = [ 'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', 'gd', 'hu', - 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', 'no', 'pt', 'sk', 'tg', 'th', 'ti', + 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', 'no', 'oc', 'pt', 'sk', 'tg', 'th', 'ti', 'ts', 'ug', 'uk', 'vo', 'za', 'zh-min-nan', 'zh', 'zu', ] + # CentralAuth cross avaliable projects. + self.cross_projects = [ + 'wikipedia', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', + 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' + ] self.obsolete = { 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… 'ab': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ab… Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2009-11-23 14:57:45 UTC (rev 7685) +++ branches/rewrite/pywikibot/family.py 2009-11-23 16:00:39 UTC (rev 7686) @@ -483,8 +483,18 @@ self.disambiguationTemplates = { '_default': [] } + + # A list of projects that share cross-project sessions. + self.cross_projects = [] + + # A list with the name for cross-project cookies. + # default for wikimedia centralAuth extensions. + self.cross_projects_cookies = ['centralauth_Session', 'centralauth_Token', 'centralauth_User'] + self.cross_projects_cookie_username = 'centralauth_User' + # A list with the name in the cross-language flag permissions self.cross_allowed = [] + # A list with the name of the category containing disambiguation # pages for the various languages. Only one category per language, # and without the namespace, so add things like: Property changes on: branches/rewrite/pywikibot/family.py ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/pywikipedia/family.py:6057-7548 + /trunk/pywikipedia/family.py:6057-7685

1 0

SVN: [7685] trunk/pywikipedia/catlib.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7685 Author: xqt Date: 2009-11-23 14:57:45 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Use cmstartsortkey (Bugfix for #2902462) Modified Paths: -------------- trunk/pywikipedia/catlib.py Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2009-11-23 14:01:26 UTC (rev 7684) +++ trunk/pywikipedia/catlib.py 2009-11-23 14:57:45 UTC (rev 7685) @@ -203,24 +203,24 @@ params['cmlimit'] = 500 else: params['cmlimit'] = wikipedia.config.special_page_limit - + if currentPageOffset: params['cmcontinue'] = currentPageOffset wikipedia.output('Getting [[%s]] list from %s...' % (self.title(), currentPageOffset[:-1])) # cmcontinue last key is '|' elif startFrom: - params['cmstart'] = startFrom + params['cmstartsortkey'] = startFrom wikipedia.output('Getting [[%s]] list starting at %s...' % (self.title(), startFrom)) else: wikipedia.output('Getting [[%s]]...' % self.title()) - + wikipedia.get_throttle() data = query.GetData(params, self.site()) if 'error' in data: raise RuntimeError("%s" % data['error']) count = 0 - + for memb in data['query']['categorymembers']: count += 1 # For MediaWiki versions where subcats look like articles

1 0

SVN: [7684] trunk/pywikipedia/welcome.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7684 Author: xqt Date: 2009-11-23 14:01:26 +0000 (Mon, 23 Nov 2009) Log Message: ----------- docu Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-11-23 13:39:16 UTC (rev 7683) +++ trunk/pywikipedia/welcome.py 2009-11-23 14:01:26 UTC (rev 7684) @@ -90,6 +90,8 @@ -quiet Prevents users without contributions are displayed + -quick Provide quick check by API bulk-retrieve user datas + ********************************* GUIDE *********************************** Report, Bad and white list guide: @@ -485,11 +487,11 @@ self.defineSign(True) if __name__ != '__main__': #use only in module call self._checkQueue = [] - + def badNameFilter(self, name, force = False): if not globalvar.filtBadName: return False - + #initialize blacklist if not hasattr(self, '_blacklist') or force: elenco = [ @@ -523,7 +525,7 @@ "vandal", " v.f. ", "v. fighter", "vandal f.", "vandal fighter", 'wales jimmy', "wheels", "wales", "www.", ] - + #blacklist from wikipage badword_page = wikipedia.Page(self.site, wikipedia.translate(self.site, bad_pag) ) list_loaded = list() @@ -535,7 +537,7 @@ wikipedia.output(u'The bad word page doesn\'t exist!') self._blacklist = elenco + elenco_others + list_loaded del elenco, elenco_others, list_loaded - + if not hasattr(self, '_whitelist') or force: #initialize whitelist whitelist_default = ['emiliano'] @@ -552,11 +554,11 @@ else: showStatus(4) wikipedia.output(u"WARNING: The whitelist hasn't been setted!") - + # Join the whitelist words. self._whitelist = list_white + whitelist_default del list_white, whitelist_default - + try: for bname in self._blacklist: if bname.lower() in str(name.lower()): #bad name positive @@ -573,7 +575,7 @@ return bname.lower() in name.lower() except UnicodeEncodeError: pass - + return False def reportBadAccount(self, name = None, final = False): @@ -587,7 +589,7 @@ globalvar.confirm = False else: answer = 'y' - + if answer.lower() in ['yes', 'y'] or not globalvar.confirm: showStatus() wikipedia.output(u'%s is possibly an unwanted username. It will be reported.' % name) @@ -595,7 +597,7 @@ self._BAQueue.append(name) else: self._BAQueue = [name] - + if len(self._BAQueue) >= globalvar.dumpToLog or final: rep_text = '' #name in queue is max, put detail to report page @@ -618,7 +620,7 @@ rep_text += wikipedia.translate(self.site, report_text) % username if self.site.lang == 'it': rep_text = "%s%s}}" % (rep_text, self.bname) - + com = wikipedia.translate(self.site, comment) if rep_text != '': rep_page.put(text_get + rep_text, comment = com, minorEdit = True) @@ -627,22 +629,22 @@ self.BAQueue = list() else: return True - + def makelogpage(self, queue = []): if not globalvar.makeWelcomeLog: return None if len(queue) == 0: return None - + text = u'' logg = wikipedia.translate(self.site, logbook) if not logg: return None - + target = logg + '/' + time.strftime('%Y/%m/%d', time.localtime(time.time())) if self.site.lang == 'it': target = logg + '/' + time.strftime('%d/%m/%Y', time.localtime(time.time())) - + logPage = wikipedia.Page(self.site, target) if logPage.exists(): text = logPage.get() @@ -653,7 +655,7 @@ text = wikipedia.translate(self.site, logpage_header) text += u'\n!%s' % self.site.namespace(2) text += u'\n!%s' % capitalize(self.site.mediawiki_message('contribslink')) - + for result in queue: # Adding the log... (don't take care of the variable's name...). luser = wikipedia.url2link(result.name(), self.site, self.site) @@ -666,7 +668,7 @@ except wikipedia.EditConflict: wikipedia.output(u'An edit conflict has occured. Pausing for 10 seconds before continuing.') time.sleep(10) - + def parseNewUserLog(self): #if __name__ != '__main__': # if self._checkQueue: @@ -682,7 +684,7 @@ for x in self._parseNewUserLogOld(): yield x return - + params = { 'action':'query', 'list':'logevents', @@ -696,15 +698,14 @@ params['lestart'] = int(now.strftime("%Y%m%d%H%M%S")) elif globalvar.offset != 0: params['lestart'] = globalvar.offset - - count = 0 + count_auto = 0 wikipedia.output("Querying new user log from API....") while True: lev = query.GetData(params, self.site) + count = len(lev['query']['logevents']) for x in lev['query']['logevents']: someone_found = True - count += 1 if 'user' not in x: continue #created twice? @@ -716,9 +717,9 @@ wikipedia.output(u'%s has been created automatically.' % x['user']) count_auto += 1 continue - + yield userlib.User(self.site, x['user']) - + if count < globalvar.queryLimit and 'query-continue' in lev: params['lestart'] = lev['query-continue']['logevents']['lestart'] else: @@ -732,7 +733,7 @@ wikipedia.output(u'There is nobody left to be welcomed...') else: wikipedia.output(u'\nLoaded all users...') - + def _parseNewUserLogOld(self): someone_found = False URL = self.site.log_address(globalvar.queryLimit, 'newusers') @@ -750,9 +751,9 @@ reg = u'\(<a href=\"' + re.escape(self.site.path()) reg += u'\?title=%s(?P<user>.*?)&(?:amp;|)action=(?:edit|editredlink|edit&redlink=1)\"' % re.escape('%s:' % urllib.quote(self.site.namespace(3).replace(" ", "_").encode(self.site.encoding()))) reg += u'.*?</span> (?P<reason>.*?) *?</li>' - + p = re.compile(reg, re.UNICODE) - + for x in p.finditer(raw): someone_found = True userN = unicode(urllib.unquote(str(x.group('user'))), 'utf-8') @@ -761,22 +762,22 @@ showStatus(3) wikipedia.output(u'%s has been created automatically, skipping...' % userN) continue - + #FIXME: It counts the first 50 edits # if number > 50, it won't work # (not *so* useful, it should be enough). yield userlib.User(self.site, userN) - + if someone_found: showStatus(5) wikipedia.output(u'There is nobody left to be welcomed...') else: wikipedia.output(u'\nLoaded all users...') - + def defineSign(self, force = False): if hasattr(self,'_randomSignature') and not force: return self._randomSignature - + signText = u'' creg = re.compile(r"^\* ?(.*?)$", re.M) if not globalvar.signFileName: @@ -786,7 +787,7 @@ wikipedia.output("%s doesn't allow random signature, force disable." % self.site) globalvar.randomSign = False return None - + signPage = wikipedia.Page(self.site, signPageName ) if signPage.exists(): wikipedia.output('Loading signature list...') @@ -804,12 +805,12 @@ except IOError: wikipedia.output(u'Error! - No fileName!') raise FilenameNotSet("No signature filename specified.") - + signText = f.read() f.close() self._randomSignature = creg.findall(signText) return self._randomSignature - + def run(self): while True: welcomed_count = 0 @@ -823,7 +824,7 @@ us = self._parseNewUserLogOld() else: us = self.parseNewUserLog() - + for users in us: if users.isBlocked(): showStatus(3) @@ -869,7 +870,7 @@ except wikipedia.EditConflict: showStatus(4) wikipedia.output(u'An edit conflict has occured, skipping this user.') - + if globalvar.makeWelcomeLog and wikipedia.translate(self.site, logbook): showStatus(5) if welcomed_count == 1: @@ -1049,7 +1050,7 @@ showStatus() wikipedia.output("Put welcomed users before quit...") bot.makelogpage(bot.welcomed_users) - wikipedia.output("Quitting...") + wikipedia.output("\nQuitting...") finally: # If there is the savedata, the script must save the number_user. if globalvar.randomSign and globalvar.saveSignIndex and bot.welcomed_users:

1 0

SVN: [7683] trunk/pywikipedia/userlib.py
by xqt＠svn.wikimedia.org 23 Nov '09

23 Nov '09

Revision: 7683 Author: xqt Date: 2009-11-23 13:39:16 +0000 (Mon, 23 Nov 2009) Log Message: ----------- bugfix for KeyError. You could only load 500 users at once. query-continue has to be implemented. Modified Paths: -------------- trunk/pywikipedia/userlib.py Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-11-23 11:35:55 UTC (rev 7682) +++ trunk/pywikipedia/userlib.py 2009-11-23 13:39:16 UTC (rev 7683) @@ -570,9 +570,11 @@ raise else: break - - for uj in self.users: - x = data[uj.name()] + for uj in self.users: + try: + x = data[uj.name()] + except KeyError: + break uj._editcount = x['editcount'] if 'groups' in x: uj._groups = x['groups']

1 0

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn November 2009