Pywikipedia-svn April 2010

pywikipedia-svn@lists.wikimedia.org

8 participants
96 discussions

SVN: [8060] branches/rewrite/pywikibot/data/api.py
by russblau＠svn.wikimedia.org 07 Apr '10

07 Apr '10

Revision: 8060 Author: russblau Date: 2010-04-07 14:12:54 +0000 (Wed, 07 Apr 2010) Log Message: ----------- Fix (for rewrite branch only) to send new login token per https://bugzilla.wikimedia.org:443/show_bug.cgi?id=23076 Modified Paths: -------------- branches/rewrite/pywikibot/data/api.py Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2010-04-07 09:26:42 UTC (rev 8059) +++ branches/rewrite/pywikibot/data/api.py 2010-04-07 14:12:54 UTC (rev 8060) @@ -741,23 +741,31 @@ lgpassword=self.password ) self.site._loginstatus = -2 - login_result = login_request.submit() - if u"login" not in login_result: - raise RuntimeError("API login response does not have 'login' key.") - if login_result['login']['result'] == u'Success': - prefix = login_result['login']['cookieprefix'] - cookies = [] - for key in ('Token', 'UserID', 'UserName'): - cookies.append("%s%s=%s" - % (prefix, key, - login_result['login']['lg'+key.lower()])) - self.username = login_result['login']['lgusername'] - return "\n".join(cookies) - elif login_result['login']['result'] == "Throttled": - self._waituntil = datetime.now() \ - + timedelta(seconds=int( - login_result["login"]["wait"]) - ) + while True: + login_result = login_request.submit() + if u"login" not in login_result: + raise RuntimeError("API login response does not have 'login' key.") + if login_result['login']['result'] == "Success": + prefix = login_result['login']['cookieprefix'] + cookies = [] + for key in ('Token', 'UserID', 'UserName'): + cookies.append("%s%s=%s" + % (prefix, key, + login_result['login']['lg'+key.lower()])) + self.username = login_result['login']['lgusername'] + return "\n".join(cookies) + elif login_result['login']['result'] == "NeedToken": + token = login_result['login']['token'] + login_request["lgtoken"] = token + continue + elif login_result['login']['result'] == "Throttled": + self._waituntil = datetime.now() \ + + timedelta(seconds=int( + login_result["login"]["wait"]) + ) + break + else: + break raise APIError(code=login_result["login"]["result"], info="") def storecookiedata(self, data):

1 0

SVN: [8059]
by xqt＠svn.wikimedia.org 07 Apr '10

07 Apr '10

Revision: 8059 Author: xqt Date: 2010-04-07 09:26:42 +0000 (Wed, 07 Apr 2010) Log Message: ----------- Modified Paths: -------------- branches/rewrite/pywikibot/families/commons_family.py branches/rewrite/pywikibot/families/incubator_family.py branches/rewrite/pywikibot/families/mediawiki_family.py branches/rewrite/pywikibot/families/meta_family.py branches/rewrite/pywikibot/families/test_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/wikiversity_family.py branches/rewrite/pywikibot/families/wiktionary_family.py trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/incubator_family.py trunk/pywikipedia/families/mediawiki_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/test_family.py 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/wikiversity_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/commons_family.py =================================================================== --- branches/rewrite/pywikibot/families/commons_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/commons_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -44,7 +44,7 @@ def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def dbName(self, code): return 'commonswiki_p' Modified: branches/rewrite/pywikibot/families/incubator_family.py =================================================================== --- branches/rewrite/pywikibot/families/incubator_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/incubator_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -15,7 +15,7 @@ } def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/mediawiki_family.py =================================================================== --- branches/rewrite/pywikibot/families/mediawiki_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/mediawiki_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -17,7 +17,7 @@ } def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/meta_family.py =================================================================== --- branches/rewrite/pywikibot/families/meta_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/meta_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -21,7 +21,7 @@ ] def version(self,code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/test_family.py =================================================================== --- branches/rewrite/pywikibot/families/test_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/test_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -15,7 +15,7 @@ } def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -103,7 +103,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -53,7 +53,7 @@ return 'utf-8' def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -667,7 +667,7 @@ return self.known_families def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def dbName(self, code): # returns the name of the MySQL database Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -112,7 +112,7 @@ } def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def code2encodings(self, code): """ Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -61,7 +61,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikiversity_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiversity_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wikiversity_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -19,7 +19,7 @@ self.langs[lang] = '%s.wikiversity.org' % lang def version(self,code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -112,7 +112,7 @@ self.interwiki_attop = ['pl'] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/commons_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -65,7 +65,7 @@ def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def dbName(self, code): return 'commonswiki_p' Modified: trunk/pywikipedia/families/incubator_family.py =================================================================== --- trunk/pywikipedia/families/incubator_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/incubator_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -34,7 +34,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/mediawiki_family.py =================================================================== --- trunk/pywikipedia/families/mediawiki_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/mediawiki_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -55,7 +55,7 @@ def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/meta_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -140,7 +140,7 @@ ] def version(self,code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/test_family.py =================================================================== --- trunk/pywikipedia/families/test_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/test_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -131,7 +131,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -360,7 +360,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikinews_family.py =================================================================== --- trunk/pywikipedia/families/wikinews_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikinews_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -223,7 +223,7 @@ return 'utf-8' def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -1226,7 +1226,7 @@ return self.known_families def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def dbName(self, code): # returns the name of the MySQL database Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -270,7 +270,7 @@ } def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def code2encodings(self, code): """ Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikisource_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -382,7 +382,7 @@ ] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wikiversity_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -124,7 +124,7 @@ ] def version(self,code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-04-07 07:05:42 UTC (rev 8058) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-04-07 09:26:42 UTC (rev 8059) @@ -462,7 +462,7 @@ self.interwiki_attop = ['pl'] def version(self, code): - return '1.16-wmf' + return '1.16wmf3' def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [8058]
by xqt＠svn.wikimedia.org 07 Apr '10

07 Apr '10

Revision: 8058 Author: xqt Date: 2010-04-07 07:05:42 +0000 (Wed, 07 Apr 2010) Log Message: ----------- New version 1.16-wmf for wm families. Update family files. Modified Paths: -------------- branches/rewrite/pywikibot/families/commons_family.py branches/rewrite/pywikibot/families/incubator_family.py branches/rewrite/pywikibot/families/mediawiki_family.py branches/rewrite/pywikibot/families/meta_family.py branches/rewrite/pywikibot/families/test_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/wikiversity_family.py branches/rewrite/pywikibot/families/wiktionary_family.py trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/incubator_family.py trunk/pywikipedia/families/mediawiki_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/test_family.py 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/wikiversity_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/commons_family.py =================================================================== --- branches/rewrite/pywikibot/families/commons_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/commons_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -44,7 +44,7 @@ def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def dbName(self, code): return 'commonswiki_p' Modified: branches/rewrite/pywikibot/families/incubator_family.py =================================================================== --- branches/rewrite/pywikibot/families/incubator_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/incubator_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -15,7 +15,7 @@ } def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/mediawiki_family.py =================================================================== --- branches/rewrite/pywikibot/families/mediawiki_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/mediawiki_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -17,7 +17,7 @@ } def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/meta_family.py =================================================================== --- branches/rewrite/pywikibot/families/meta_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/meta_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -21,7 +21,7 @@ ] def version(self,code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/test_family.py =================================================================== --- branches/rewrite/pywikibot/families/test_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/test_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -15,7 +15,7 @@ } def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -15,8 +15,8 @@ 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'zh', 'sv', 'ca', 'da', 'tr', 'th', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'is', 'gl', 'no', 'ta', 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', - 'cv', 'sl', 'uk', 'et', 'mr', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', - 'fy', 'hi', 'ie', 'si', 'tg', 'bn', 'af', 'hy', 'te', 'bs', 'pa', + 'cv', 'uk', 'sl', 'et', 'mr', 'si', 'ur', 'ml', 'az', 'oc', 'ms', + 'eu', 'fy', 'hi', 'ie', 'tg', 'bn', 'hy', 'af', 'te', 'bs', 'pa', 'sa', 'ky', 'be', 'ast', 'tt', 'zh-min-nan', 'cy', 'mg', 'ne', 'ku', 'co', 'sw', 'tk', 'su', 'als', 'vo', 'uz', 'na', 'mn', 'kk', 'nds', 'zu', 'my', @@ -103,7 +103,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -12,7 +12,7 @@ self.languages_by_size = [ 'sr', 'en', 'pl', 'de', 'fr', 'it', 'pt', 'es', 'zh', 'ja', 'sv', - 'ru', 'fi', 'he', 'cs', 'ar', 'sd', 'bg', 'hu', 'ro', 'ta', 'no', + 'ru', 'fi', 'he', 'cs', 'ar', 'sd', 'bg', 'ro', 'hu', 'ta', 'no', 'uk', 'ca', 'tr', 'bs', 'th', ] @@ -53,7 +53,7 @@ return 'utf-8' def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -14,27 +14,27 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vo', 'vi', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'hi', - 'eu', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'bs', - 'lb', 'sh', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'bpy', 'pms', + 'sl', 'hr', 'et', 'ms', 'new', 'th', 'simple', 'gl', 'nn', 'eu', + 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', + 'bs', 'lb', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'bpy', 'pms', 'be-x-old', 'war', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'scn', 'fy', 'qu', 'su', 'af', 'gu', 'zh-yue', 'ast', 'nap', 'ur', - 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'lmo', 'ga', 'tg', - 'roa-tara', 'vec', 'hy', 'kn', 'gd', 'uz', 'yi', 'pam', 'mi', - 'zh-min-nan', 'yo', 'kk', 'als', 'nah', 'sah', 'li', 'glk', 'hsb', - 'tt', 'co', 'roa-rup', 'arz', 'os', 'ia', 'gan', 'bcl', 'mn', - 'fiu-vro', 'nds-nl', 'vls', 'tk', 'fo', 'sa', 'pnb', 'am', 'dv', - 'nrm', 'ne', 'pag', 'rm', 'bar', 'map-bms', 'gv', 'wuu', 'my', + 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'nap', 'ur', + 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'lmo', 'ksh', 'ga', 'tg', + 'roa-tara', 'vec', 'hy', 'kn', 'gd', 'uz', 'yi', 'pam', 'yo', + 'zh-min-nan', 'mi', 'kk', 'als', 'sah', 'nah', 'li', 'glk', 'tt', + 'hsb', 'co', 'roa-rup', 'arz', 'os', 'gan', 'ia', 'bcl', 'mn', + 'fiu-vro', 'nds-nl', 'vls', 'fo', 'tk', 'pnb', 'sa', 'am', 'dv', + 'ne', 'nrm', 'pag', 'rm', 'bar', 'map-bms', 'gv', 'wuu', 'my', 'sco', 'diq', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', - 'frp', 'ang', 'kw', 'pdc', 'haw', 'hif', 'ckb', 'szl', 'bo', 'ps', - 'pa', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', + 'frp', 'ang', 'kw', 'hif', 'pdc', 'haw', 'ckb', 'szl', 'bo', 'pa', + 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'mhr', 'nv', 'ace', 'ky', 'ext', 'arc', 'jbo', 'wo', 'cbk-zam', - 'ty', 'tpi', 'eml', 'kab', 'so', 'zea', 'srn', 'pap', 'ay', 'krc', - 'ig', 'ba', 'or', 'kg', 'lo', 'dsb', 'udm', 'rmy', 'cu', 'kaa', - 'ce', 'ab', 'kl', 'xal', 'sm', 'mwl', 'av', 'ks', 'tet', 'got', + 'ty', 'tpi', 'eml', 'kab', 'so', 'xal', 'zea', 'srn', 'pap', 'ay', + 'krc', 'ba', 'ig', 'or', 'kg', 'dsb', 'lo', 'udm', 'rmy', 'kl', + 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'pcd', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', - 'chr', 'bug', 'om', 'ee', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', + 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'lg', 'lbe', 'tum', 'chy', 'rn', @@ -667,7 +667,7 @@ return self.known_families def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def dbName(self, code): # returns the name of the MySQL database Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -13,8 +13,8 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', - 'sv', 'nl', 'no', 'eo', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ka', - 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'cy', 'ml', 'li', 'is', + 'sv', 'nl', 'eo', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ka', + 'ar', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'sq', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', 'am', 'co', @@ -112,7 +112,7 @@ } def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def code2encodings(self, code): """ Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -14,8 +14,8 @@ 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'it', 'he', 'ar', 'hu', 'fa', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', 'sl', 'uk', 'ko', 'sr', 'vi', 'ja', 'el', 'la', 'li', 'yi', 'bn', - 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'no', 'mk', 'da', 'et', - 'ta', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', + 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'no', 'mk', 'da', 'ta', + 'et', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] for lang in self.languages_by_size: @@ -61,7 +61,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wikiversity_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiversity_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wikiversity_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -19,7 +19,7 @@ self.langs[lang] = '%s.wikiversity.org' % lang def version(self,code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -13,17 +13,17 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'pt', 'fi', 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'lo', 'kn', - 'ja', 'ku', 'ar', 'es', 'ml', 'ro', 'et', 'id', 'te', 'gl', 'bg', + 'ja', 'ml', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'li', 'is', 'fa', 'scn', 'sr', 'af', 'cs', 'th', 'sw', 'simple', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', - 'tt', 'la', 'zh-min-nan', 'da', 'tk', 'wa', 'ast', 'ur', 'hsb', + 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'tk', 'ast', 'ur', 'hsb', 'kk', 'ky', 'eo', 'wo', 'lv', 'ang', 'hi', 'ka', 'ga', 'gn', 'az', - 'ia', 'co', 'eu', 'sk', 'ne', 'csb', 'st', 'ms', 'tl', 'mr', 'cy', - 'my', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', 'bn', + 'ia', 'co', 'eu', 'sk', 'my', 'ne', 'csb', 'st', 'ms', 'tl', 'mr', + 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', 'bn', 'gu', 'mg', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', - 'su', 'om', 'mn', 'nah', 'ie', 'be', 'iu', 'yi', 'gd', 'tg', 'si', - 'nn', 'gv', 'kw', 'zu', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'mi', 'jv', 'uz', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', + 'su', 'be', 'om', 'mn', 'nah', 'ie', 'iu', 'yi', 'gd', 'tg', 'si', + 'nn', 'gv', 'zu', 'kw', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', + 'mi', 'uz', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] @@ -112,7 +112,7 @@ self.interwiki_attop = ['pl'] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/commons_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -65,7 +65,7 @@ def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def dbName(self, code): return 'commonswiki_p' Modified: trunk/pywikipedia/families/incubator_family.py =================================================================== --- trunk/pywikipedia/families/incubator_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/incubator_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -34,7 +34,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/mediawiki_family.py =================================================================== --- trunk/pywikipedia/families/mediawiki_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/mediawiki_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -55,7 +55,7 @@ def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/meta_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -140,7 +140,7 @@ ] def version(self,code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/test_family.py =================================================================== --- trunk/pywikipedia/families/test_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/test_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -131,7 +131,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -15,8 +15,8 @@ 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'zh', 'sv', 'ca', 'da', 'tr', 'th', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'is', 'gl', 'no', 'ta', 'ka', 'ko', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'ia', 'ang', - 'cv', 'sl', 'uk', 'et', 'mr', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', - 'fy', 'hi', 'ie', 'si', 'tg', 'bn', 'af', 'hy', 'te', 'bs', 'pa', + 'cv', 'uk', 'sl', 'et', 'mr', 'si', 'ur', 'ml', 'az', 'oc', 'ms', + 'eu', 'fy', 'hi', 'ie', 'tg', 'bn', 'hy', 'af', 'te', 'bs', 'pa', 'sa', 'ky', 'be', 'ast', 'tt', 'zh-min-nan', 'cy', 'mg', 'ne', 'ku', 'co', 'sw', 'tk', 'su', 'als', 'vo', 'uz', 'na', 'mn', 'kk', 'nds', 'zu', 'my', @@ -360,7 +360,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikinews_family.py =================================================================== --- trunk/pywikipedia/families/wikinews_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikinews_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -12,7 +12,7 @@ self.languages_by_size = [ 'sr', 'en', 'pl', 'de', 'fr', 'it', 'pt', 'es', 'zh', 'ja', 'sv', - 'ru', 'fi', 'he', 'cs', 'ar', 'sd', 'bg', 'hu', 'ro', 'ta', 'no', + 'ru', 'fi', 'he', 'cs', 'ar', 'sd', 'bg', 'ro', 'hu', 'ta', 'no', 'uk', 'ca', 'tr', 'bs', 'th', ] @@ -223,7 +223,7 @@ return 'utf-8' def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -14,27 +14,27 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', 'sv', 'zh', 'no', 'ca', 'fi', 'uk', 'cs', 'hu', 'tr', 'ro', 'ko', 'eo', 'da', 'ar', 'id', 'vo', 'vi', 'sk', 'sr', 'lt', 'he', 'bg', 'fa', - 'sl', 'hr', 'et', 'new', 'ms', 'th', 'simple', 'gl', 'nn', 'hi', - 'eu', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'bs', - 'lb', 'sh', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'bpy', 'pms', + 'sl', 'hr', 'et', 'ms', 'new', 'th', 'simple', 'gl', 'nn', 'eu', + 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'la', 'ka', 'br', 'az', 'sh', + 'bs', 'lb', 'is', 'mr', 'cy', 'lv', 'jv', 'sq', 'tl', 'bpy', 'pms', 'be-x-old', 'war', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'scn', 'fy', 'qu', 'su', 'af', 'gu', 'zh-yue', 'ast', 'nap', 'ur', - 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'lmo', 'ga', 'tg', - 'roa-tara', 'vec', 'hy', 'kn', 'gd', 'uz', 'yi', 'pam', 'mi', - 'zh-min-nan', 'yo', 'kk', 'als', 'nah', 'sah', 'li', 'glk', 'hsb', - 'tt', 'co', 'roa-rup', 'arz', 'os', 'ia', 'gan', 'bcl', 'mn', - 'fiu-vro', 'nds-nl', 'vls', 'tk', 'fo', 'sa', 'pnb', 'am', 'dv', - 'nrm', 'ne', 'pag', 'rm', 'bar', 'map-bms', 'gv', 'wuu', 'my', + 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'nap', 'ur', + 'ku', 'bat-smg', 'ml', 'wa', 'cv', 'lmo', 'ksh', 'ga', 'tg', + 'roa-tara', 'vec', 'hy', 'kn', 'gd', 'uz', 'yi', 'pam', 'yo', + 'zh-min-nan', 'mi', 'kk', 'als', 'sah', 'nah', 'li', 'glk', 'tt', + 'hsb', 'co', 'roa-rup', 'arz', 'os', 'gan', 'ia', 'bcl', 'mn', + 'fiu-vro', 'nds-nl', 'vls', 'fo', 'tk', 'pnb', 'sa', 'am', 'dv', + 'ne', 'nrm', 'pag', 'rm', 'bar', 'map-bms', 'gv', 'wuu', 'my', 'sco', 'diq', 'se', 'fur', 'lij', 'si', 'ug', 'nov', 'mt', 'bh', 'mzn', 'csb', 'ilo', 'zh-classical', 'pi', 'lad', 'km', 'sc', 'mg', - 'frp', 'ang', 'kw', 'pdc', 'haw', 'hif', 'ckb', 'szl', 'bo', 'ps', - 'pa', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', + 'frp', 'ang', 'kw', 'hif', 'pdc', 'haw', 'ckb', 'szl', 'bo', 'pa', + 'ps', 'ie', 'hak', 'kv', 'to', 'crh', 'stq', 'myv', 'gn', 'ln', 'mhr', 'nv', 'ace', 'ky', 'ext', 'arc', 'jbo', 'wo', 'cbk-zam', - 'ty', 'tpi', 'eml', 'kab', 'so', 'zea', 'srn', 'pap', 'ay', 'krc', - 'ig', 'ba', 'or', 'kg', 'lo', 'dsb', 'udm', 'rmy', 'cu', 'kaa', - 'ce', 'ab', 'kl', 'xal', 'sm', 'mwl', 'av', 'ks', 'tet', 'got', + 'ty', 'tpi', 'eml', 'kab', 'so', 'xal', 'zea', 'srn', 'pap', 'ay', + 'krc', 'ba', 'ig', 'or', 'kg', 'dsb', 'lo', 'udm', 'rmy', 'kl', + 'cu', 'kaa', 'ab', 'mwl', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'mdf', 'pcd', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', - 'chr', 'bug', 'om', 'ee', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', + 'chr', 'bug', 'ee', 'om', 'zu', 'fj', 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'dz', 'ch', 'cr', 'xh', 'ak', 'sg', 'tn', 'ki', 'ik', 'bxr', 'rw', 'tw', 'st', 'ny', 'sn', 'ff', 'lg', 'lbe', 'tum', 'chy', 'rn', @@ -1226,7 +1226,7 @@ return self.known_families def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def dbName(self, code): # returns the name of the MySQL database Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -13,8 +13,8 @@ self.languages_by_size = [ 'en', 'it', 'pl', 'de', 'pt', 'ru', 'sk', 'es', 'bg', 'bs', 'sl', 'tr', 'fr', 'he', 'lt', 'cs', 'zh', 'el', 'hu', 'fa', 'uk', 'id', - 'sv', 'nl', 'no', 'eo', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ka', - 'ar', 'ko', 'ku', 'hr', 'gl', 'ro', 'sr', 'cy', 'ml', 'li', 'is', + 'sv', 'nl', 'eo', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ka', + 'ar', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'sq', 'eu', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', 'su', 'ur', 'wo', 'ky', 'kn', 'am', 'co', @@ -270,7 +270,7 @@ } def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def code2encodings(self, code): """ Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikisource_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -14,8 +14,8 @@ 'en', 'zh', 'pt', 'ru', 'fr', 'es', 'de', 'it', 'he', 'ar', 'hu', 'fa', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr', 'nl', 'sv', 'sl', 'uk', 'ko', 'sr', 'vi', 'ja', 'el', 'la', 'li', 'yi', 'bn', - 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'no', 'mk', 'da', 'et', - 'ta', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', + 'ml', 'az', 'is', 'bs', 'hy', 'ca', 'id', 'no', 'mk', 'da', 'ta', + 'et', 'bg', 'lt', 'gl', 'kn', 'cy', 'sk', 'zh-min-nan', 'fo', ] if family.config.SSL_connection: @@ -382,7 +382,7 @@ ] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wikiversity_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -124,7 +124,7 @@ ] def version(self,code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-04-06 09:02:45 UTC (rev 8057) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-04-07 07:05:42 UTC (rev 8058) @@ -13,17 +13,17 @@ self.languages_by_size = [ 'fr', 'en', 'lt', 'tr', 'zh', 'ru', 'vi', 'io', 'pl', 'pt', 'fi', 'hu', 'el', 'no', 'ta', 'de', 'it', 'sv', 'ko', 'nl', 'lo', 'kn', - 'ja', 'ku', 'ar', 'es', 'ml', 'ro', 'et', 'id', 'te', 'gl', 'bg', + 'ja', 'ml', 'ku', 'ar', 'es', 'ro', 'et', 'id', 'te', 'gl', 'bg', 'uk', 'ca', 'vo', 'li', 'is', 'fa', 'scn', 'sr', 'af', 'cs', 'th', 'sw', 'simple', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', - 'tt', 'la', 'zh-min-nan', 'da', 'tk', 'wa', 'ast', 'ur', 'hsb', + 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'tk', 'ast', 'ur', 'hsb', 'kk', 'ky', 'eo', 'wo', 'lv', 'ang', 'hi', 'ka', 'ga', 'gn', 'az', - 'ia', 'co', 'eu', 'sk', 'ne', 'csb', 'st', 'ms', 'tl', 'mr', 'cy', - 'my', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', 'bn', + 'ia', 'co', 'eu', 'sk', 'my', 'ne', 'csb', 'st', 'ms', 'tl', 'mr', + 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'an', 'sh', 'bn', 'gu', 'mg', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', 'chr', - 'su', 'om', 'mn', 'nah', 'ie', 'be', 'iu', 'yi', 'gd', 'tg', 'si', - 'nn', 'gv', 'kw', 'zu', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'mi', 'jv', 'uz', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', + 'su', 'be', 'om', 'mn', 'nah', 'ie', 'iu', 'yi', 'gd', 'tg', 'si', + 'nn', 'gv', 'zu', 'kw', 'mt', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', + 'mi', 'uz', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] @@ -462,7 +462,7 @@ self.interwiki_attop = ['pl'] def version(self, code): - return '1.16alpha-wmf' + return '1.16-wmf' def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [8057] trunk/pywikipedia/selflink.py
by xqt＠svn.wikimedia.org 06 Apr '10

06 Apr '10

Revision: 8057 Author: xqt Date: 2010-04-06 09:02:45 +0000 (Tue, 06 Apr 2010) Log Message: ----------- ption to automatically change pages. Not to wait for operators reaction (request #2981327) Modified Paths: -------------- trunk/pywikipedia/selflink.py Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2010-04-06 07:55:06 UTC (rev 8056) +++ trunk/pywikipedia/selflink.py 2010-04-06 09:02:45 UTC (rev 8057) @@ -13,6 +13,9 @@ or pages-meta-current, see http://download.wikimedia.org). Argument can also be given as "-xml:filename". + -always Unlink always but don't prompt you for each replacement. + ATTENTION: Use this with care! + -namespace:n Number of namespace to process. The parameter can be used multiple times. It works in combination with all other parameters, except for the -start parameter. If you e.g. @@ -90,7 +93,7 @@ class SelflinkBot: - def __init__(self, generator): + def __init__(self, generator, always=False): self.generator = generator linktrail = wikipedia.getSite().linktrail() # The regular expression which finds links. Results consist of four groups: @@ -100,6 +103,8 @@ # group linktrail is the link trail, that's letters after ]] which are part of the word. # note that the definition of 'letter' varies from language to language. self.linkR = re.compile(r'\[\[(?P<title>[^\]\|#]*)(?P<section>#[^\]\|]*)?(\|(?P<label>[^\]]*))?\]\](?P<linktrail>' + linktrail + ')') + self.always = always + self.done = False def handleNextLink(self, page, text, match, context = 100): """ @@ -128,32 +133,46 @@ else: # at the beginning of the link, start red color. # at the end of the link, reset the color to default - wikipedia.output(text[max(0, match.start() - context) : match.start()] + '\03{lightred}' + text[match.start() : match.end()] + '\03{default}' + text[match.end() : match.end() + context]) - choice = wikipedia.inputChoice(u'\nWhat shall be done with this selflink?', ['unlink', 'make bold', 'skip', 'edit', 'more context'], ['U', 'b', 's', 'e', 'm'], 'u') - wikipedia.output(u'') + if self.always: + choice = 'a' + else: + wikipedia.output( + text[max(0, match.start() - context) : match.start()] \ + + '\03{lightred}' + text[match.start() : match.end()] \ + + '\03{default}' + text[match.end() : match.end() + context]) + choice = wikipedia.inputChoice( + u'\nWhat shall be done with this selflink?\n', + ['unlink', 'make bold', 'skip', 'edit', 'more context', + 'unlink all', 'quit'], + ['U', 'b', 's', 'e', 'm', 'a', 'q'], 'u') + wikipedia.output(u'') - if choice == 's': - # skip this link - return text, False - elif choice == 'e': - editor = editarticle.TextEditor() - newText = editor.edit(text, jumpIndex = match.start()) - # if user didn't press Cancel - if newText: - return newText, True - else: - return text, True - elif choice == 'm': - # show more context by recursive self-call - return self.handleNextLink(page, text, match, context = context + 100) + if choice == 's': + # skip this link + return text, False + elif choice == 'e': + editor = editarticle.TextEditor() + newText = editor.edit(text, jumpIndex = match.start()) + # if user didn't press Cancel + if newText: + return newText, True + else: + return text, True + elif choice == 'm': + # show more context by recursive self-call + return self.handleNextLink(page, text, match, context = context + 100) + elif choice == 'a': + self.always = True + elif choice == 'q': + self.done = True + return text, False + new = match.group('label') or match.group('title') + new += match.group('linktrail') + if choice == 'b': + # make bold + return text[:match.start()] + "'''" + new + "'''" + text[match.end():], False else: - new = match.group('label') or match.group('title') - new += match.group('linktrail') - if choice == 'u': - return text[:match.start()] + new + text[match.end():], False - else: - # make bold - return text[:match.start()] + "'''" + new + "'''" + text[match.end():], False + return text[:match.start()] + new + text[match.end():], False def treat(self, page): # Show the title of the page we're working on. @@ -196,6 +215,7 @@ wikipedia.setAction(comment) for page in self.generator: + if self.done: break self.treat(page) def main(): @@ -211,6 +231,7 @@ # that are also used by other scripts and that determine on which pages # to work on. genFactory = pagegenerators.GeneratorFactory() + always = False for arg in wikipedia.handleArgs(): if arg.startswith('-xml'): @@ -236,6 +257,8 @@ namespaces.append(int(arg[11:])) except ValueError: namespaces.append(arg[11:]) + elif arg == '-always': + always = True else: if not genFactory.handleArg(arg): pageTitle.append(arg) @@ -251,7 +274,7 @@ if namespaces != []: gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = SelflinkBot(preloadingGen) + bot = SelflinkBot(preloadingGen, always) bot.run() if __name__ == "__main__":

1 0

SVN: [8056] trunk/pywikipedia/selflink.py
by xqt＠svn.wikimedia.org 06 Apr '10

06 Apr '10

Revision: 8056 Author: xqt Date: 2010-04-06 07:55:06 +0000 (Tue, 06 Apr 2010) Log Message: ----------- Ignore invalid title error (bugfix #2981290) Modified Paths: -------------- trunk/pywikipedia/selflink.py Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2010-04-06 07:35:40 UTC (rev 8055) +++ trunk/pywikipedia/selflink.py 2010-04-06 07:55:06 UTC (rev 8056) @@ -109,11 +109,18 @@ should be reset to 0. This is required after the user has edited the article. """ - # ignore interwiki links and links to sections of the same page as well as section links - if not match.group('title') or page.site().isInterwikiLink(match.group('title')) or match.group('section'): + # ignore interwiki links and links to sections of the same page as well + # as section links + if not match.group('title') \ + or page.site().isInterwikiLink(match.group('title')) \ + or match.group('section'): return text, False - - linkedPage = wikipedia.Page(page.site(), match.group('title')) + try: + linkedPage = wikipedia.Page(page.site(), match.group('title')) + except wikipedia.InvalidTitle, err: + wikipedia.output(u'Warning: %s' % err) + return text, False + # Check whether the link found is to the current page itself. if linkedPage != page: # not a self-link

1 0

SVN: [8055]
by xqt＠svn.wikimedia.org 06 Apr '10

06 Apr '10

Revision: 8055 Author: xqt Date: 2010-04-06 07:35:40 +0000 (Tue, 06 Apr 2010) Log Message: ----------- change bot status page to Wikipedia:Bot/Status (bugfix #2982162) Modified Paths: -------------- branches/rewrite/pywikibot/login.py trunk/pywikipedia/login.py Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2010-04-05 20:45:17 UTC (rev 8054) +++ branches/rewrite/pywikibot/login.py 2010-04-06 07:35:40 UTC (rev 8055) @@ -58,7 +58,7 @@ # the bot's user page in a specific list. botList = { 'wikipedia': { - 'en': u'Wikipedia:Registered bots', + 'en': u'Wikipedia:Bot/Status', # Disabled because they are now using a template system which # we can't check with our current code. #'simple': u'Wikipedia:Bots', Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2010-04-05 20:45:17 UTC (rev 8054) +++ trunk/pywikipedia/login.py 2010-04-06 07:35:40 UTC (rev 8055) @@ -39,7 +39,7 @@ 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. +hash, 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. @@ -57,13 +57,14 @@ import re, os, query import urllib2 -import wikipedia, config +import config +import wikipedia # On some wikis you are only allowed to run a bot if there is a link to # the bot's user page in a specific list. botList = { 'wikipedia': { - 'en': u'Wikipedia:Registered bots', + 'en': u'Wikipedia:Bot/Status', # Disabled because they are now using a template system which # we can't check with our current code. #'simple': u'Wikipedia:Bots',

1 0

SVN: [8054] branches/rewrite/pywikibot/userinterfaces/terminal_interface.py
by russblau＠svn.wikimedia.org 05 Apr '10

05 Apr '10

Revision: 8054 Author: russblau Date: 2010-04-05 20:45:17 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Apparently some operating systems can return unicode input. Modified Paths: -------------- branches/rewrite/pywikibot/userinterfaces/terminal_interface.py Modified: branches/rewrite/pywikibot/userinterfaces/terminal_interface.py =================================================================== --- branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2010-04-05 16:24:15 UTC (rev 8053) +++ branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2010-04-05 20:45:17 UTC (rev 8054) @@ -180,7 +180,8 @@ finally: TerminalHandler.sharedlock.release() - text = unicode(text, config.console_encoding) + if not isinstance(text, unicode): + text = unicode(text, config.console_encoding) return text def inputChoice(self, question, options, hotkeys, default=None):

1 0

SVN: [8053] branches/rewrite/scripts/template.py
by russblau＠svn.wikimedia.org 05 Apr '10

05 Apr '10

Revision: 8053 Author: russblau Date: 2010-04-05 16:24:15 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Ported to rewrite branch. Modified Paths: -------------- branches/rewrite/scripts/template.py Modified: branches/rewrite/scripts/template.py =================================================================== --- branches/rewrite/scripts/template.py 2010-04-05 15:45:22 UTC (rev 8052) +++ branches/rewrite/scripts/template.py 2010-04-05 16:24:15 UTC (rev 8053) @@ -89,10 +89,10 @@ # __version__='$Id$' # -import wikipedia as pywikibot -import config -import replace, pagegenerators -import re, sys, string, catlib +import pywikibot +from pywikibot import config, pagegenerators, catlib +from scripts import replace +import re, sys, string class XmlDumpTemplatePageGenerator: """ @@ -107,7 +107,7 @@ templates * xmlfilename - The dump's path, either absolute or relative """ - + raise NotImplementedError("Sorry, no XML reader in rewrite yet.") self.templates = templates self.xmlfilename = xmlfilename @@ -285,8 +285,8 @@ 'zh':u'機器人: 更換模板 %s', } - def __init__(self, generator, templates, subst = False, remove = False, editSummary = '', - acceptAll = False, addedCat = None): + def __init__(self, generator, templates, subst = False, remove = False, + editSummary = '', acceptAll = False, addedCat = None): """ Arguments: * generator - A page generator. @@ -304,28 +304,35 @@ self.editSummary = editSummary self.acceptAll = acceptAll self.addedCat = addedCat + s = pywikibot.Site() if self.addedCat: - self.addedCat = catlib.Category(pywikibot.getSite(), 'Category:' + self.addedCat) + self.addedCat = pywikibot.Category(s, + s.namespace(14) + ':' + self.addedCat) # get edit summary message if it's empty if (self.editSummary==''): oldTemplateNames = (', ').join(self.templates.keys()) - mysite = pywikibot.getSite() if self.remove: if len(self.templates) > 1: - self.editSummary = pywikibot.translate(mysite, self.msgs_remove) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msgs_remove) \ + % oldTemplateNames else: - self.editSummary = pywikibot.translate(mysite, self.msg_remove) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msg_remove) \ + % oldTemplateNames elif self.subst: if len(self.templates) > 1: - self.editSummary = pywikibot.translate(mysite, self.msgs_subst) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msgs_subst) \ + % oldTemplateNames else: - self.editSummary = pywikibot.translate(mysite, self.msg_subst) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msg_subst) \ + % oldTemplateNames else: if len(self.templates) > 1: - self.editSummary = pywikibot.translate(mysite, self.msgs_change) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msgs_change) \ + % oldTemplateNames else: - self.editSummary = pywikibot.translate(mysite, self.msg_change) % oldTemplateNames + self.editSummary = pywikibot.translate(s, self.msg_change) \ + % oldTemplateNames def run(self): """ @@ -339,27 +346,38 @@ replacements = [] exceptions = {} + s = pywikibot.Site() for old, new in self.templates.iteritems(): - if not pywikibot.getSite().nocapitalize: - pattern = '[' + re.escape(old[0].upper()) + re.escape(old[0].lower()) + ']' + re.escape(old[1:]) + if not s.nocapitalize: + pattern = '[' + re.escape(old[0].upper()) \ + + re.escape(old[0].lower()) + ']' \ + + re.escape(old[1:]) else: pattern = re.escape(old) pattern = re.sub(r'_|\\ ', r'[_ ]', pattern) - templateRegex = re.compile(r'\{\{ *([Tt]emplate:|[mM][sS][gG]:)?' + pattern + r'(?P<parameters>\s*\|.+?|) *}}', re.DOTALL) + templateRegex = re.compile(r'\{\{ *([Tt]emplate:|[mM][sS][gG]:)?' + + pattern + + r'(?P<parameters>\s*\|.+?|) *}}', + re.DOTALL) if self.remove: replacements.append((templateRegex, '')) elif self.subst: - replacements.append((templateRegex, '{{subst:' + old + '\g<parameters>}}')) + replacements.append((templateRegex, + '{{subst:' + old + '\g<parameters>}}')) exceptions['inside-tags']=['ref'] else: - replacements.append((templateRegex, '{{' + new + '\g<parameters>}}')) + replacements.append((templateRegex, + '{{' + new + '\g<parameters>}}')) - replaceBot = replace.ReplaceRobot(self.generator, replacements, exceptions, acceptall = self.acceptAll, addedCat=self.addedCat, editSummary=self.editSummary) + replaceBot = replace.ReplaceRobot(self.generator, replacements, + exceptions, acceptall=self.acceptAll, + addedCat=self.addedCat, + summary=self.editSummary) replaceBot.run() -def main(): +def main(*args): templateNames = [] templates = {} subst = False @@ -372,7 +390,7 @@ # If xmlfilename is None, references will be loaded from the live wiki. xmlfilename = None # read command line parameters - for arg in pywikibot.handleArgs(): + for arg in pywikibot.handleArgs(*args): if arg == '-remove': remove = True elif arg == '-subst': @@ -395,7 +413,9 @@ acceptAll = True else: if not genFactory.handleArg(arg): - templateNames.append(pywikibot.Page(pywikibot.getSite(), arg, defaultNamespace=10).titleWithoutNamespace()) + templateNames.append( + pywikibot.Page(pywikibot.Site(), arg, ns=10 + ).title(withNamespace=False)) if subst or remove: for templateName in templateNames: @@ -405,13 +425,14 @@ for i in range(0, len(templateNames), 2): templates[templateNames[i]] = templateNames[i + 1] except IndexError: - pywikibot.output(u'Unless using -subst or -remove, you must give an even number of template names.') + pywikibot.output( +u'Unless using -subst or -remove, you must give an even number of template names.') return oldTemplates = [] - ns = pywikibot.getSite().template_namespace() + ns = pywikibot.Site().template_namespace() for templateName in templates.keys(): - oldTemplate = pywikibot.Page(pywikibot.getSite(), templateName, defaultNamespace=10) + oldTemplate = pywikibot.Page(pywikibot.Site(), templateName, ns=10) oldTemplates.append(oldTemplate) if xmlfilename: @@ -420,7 +441,8 @@ gen = genFactory.getCombinedGenerator() if not gen: gens = [] - gens = [pagegenerators.ReferringPageGenerator(t, onlyTemplateInclusion = True) for t in oldTemplates] + gens = [pagegenerators.ReferringPageGenerator(t, + onlyTemplateInclusion = True) for t in oldTemplates] gen = pagegenerators.CombinedPageGenerator(gens) gen = pagegenerators.DuplicateFilterPageGenerator(gen) @@ -429,11 +451,14 @@ preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary, acceptAll, addedCat) + bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary, + acceptAll, addedCat) bot.run() if __name__ == "__main__": try: main() + except Exception: + pywikibot.error("Fatal error:", exc_info=True) finally: pywikibot.stopme()

1 0

SVN: [8052] branches/rewrite/scripts/template.py
by russblau＠svn.wikimedia.org 05 Apr '10

05 Apr '10

Revision: 8052 Author: russblau Date: 2010-04-05 15:45:22 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Copying for port to rewrite branch. Added Paths: ----------- branches/rewrite/scripts/template.py Copied: branches/rewrite/scripts/template.py (from rev 8051, trunk/pywikipedia/template.py) =================================================================== --- branches/rewrite/scripts/template.py (rev 0) +++ branches/rewrite/scripts/template.py 2010-04-05 15:45:22 UTC (rev 8052) @@ -0,0 +1,439 @@ +# -*- coding: utf-8 -*- +""" +Very simple script to replace a template with another one, +and to convert the old MediaWiki boilerplate format to the new template format. + +Syntax: python template.py [-remove] [xml[:filename]] oldTemplate [newTemplate] + +Specify the template on the command line. The program will +pick up the template page, and look for all pages using it. It will +then automatically loop over them, and replace the template. + +Command line options: + +-remove Remove every occurence of the template from every article + +-subst Resolves the template by putting its text directly into the article. + This is done by changing {{...}} or {{msg:...}} into {{subst:...}} + +-xml retrieve information from a local dump (http://download.wikimedia.org). + if this argument isn\'t given, info will be loaded from the maintenance + page of the live wiki. + argument can also be given as "-xml:filename.xml". + +-namespace: Only process templates in the given namespace number (may be used + multiple times). + +-summary: Lets you pick a custom edit summary. Use quotes if edit summary contains + spaces. + +-always Don't bother asking to confirm any of the changes, Just Do It. + +-category: Appends the given category to every page that is edited. This is useful when + a category is being broken out from a template parameter or when templates are + being upmerged but more information must be preserved. + +other: First argument is the old template name, second one is the new + name. + + If you want to address a template which has spaces, put quotation + marks around it, or use underscores. + +Examples: + +If you have a template called [[Template:Cities in Washington]] and want to +change it to [[Template:Cities in Washington state]], start + + python template.py "Cities in Washington" "Cities in Washington state" + +Move the page [[Template:Cities in Washington]] manually afterwards. + + +If you have a template called [[Template:test]] and want to substitute it only on pages +in the User: and User talk: namespaces, do: + + python template.py test -namespace:2 -namespace:3 + +Note that, on the English Wikipedia, User: is namespace 2 and User talk: is namespace 3. +This may differ on other projects so make sure to find out the appropriate namespace numbers. + + +This next example substitutes the template lived with a supplied edit summary. It only +performs substitutions in main article namespace and doesn't prompt to start replacing. +Note that -putthrottle: is a global pywikipedia parameter. + + python template.py -putthrottle:30 -namespace:0 lived -always + -summary:"ROBOT: Substituting {{lived}}, see [[WP:SUBST]]." + + +This next example removes the templates {{cfr}}, {{cfru}}, and {{cfr-speedy}} from five +category pages as given: + + python template.py cfr cfru cfr-speedy -remove -always + -page:"Category:Mountain monuments and memorials" -page:"Category:Indian family names" + -page:"Category:Tennis tournaments in Belgium" -page:"Category:Tennis tournaments in Germany" + -page:"Category:Episcopal cathedrals in the United States" + -summary:"Removing Cfd templates from category pages that survived." + + +This next example substitutes templates test1, test2, and space test on all pages: + + python template.py test1 test2 "space test" -subst -always + +""" +# +# (C) Daniel Herding, 2004 +# (C) Rob W.W. Hooft, 2003 +# +# Distributed under the terms of the MIT license. +# +__version__='$Id$' +# +import wikipedia as pywikibot +import config +import replace, pagegenerators +import re, sys, string, catlib + +class XmlDumpTemplatePageGenerator: + """ + Generator which will yield Pages to pages that might contain the chosen + template. These pages will be retrieved from a local XML dump file + (cur table). + """ + def __init__(self, templates, xmlfilename): + """ + Arguments: + * templateNames - A list of Page object representing the searched + templates + * xmlfilename - The dump's path, either absolute or relative + """ + + self.templates = templates + self.xmlfilename = xmlfilename + + def __iter__(self): + """ + Yield page objects until the entire XML dump has been read. + """ + import xmlreader + mysite = pywikibot.getSite() + dump = xmlreader.XmlDump(self.xmlfilename) + # regular expression to find the original template. + # {{vfd}} does the same thing as {{Vfd}}, so both will be found. + # The old syntax, {{msg:vfd}}, will also be found. + # TODO: check site.nocapitalize() + templatePatterns = [] + for template in self.templates: + templatePattern = template.titleWithoutNamespace() + if not pywikibot.getSite().nocapitalize: + templatePattern = '[' + templatePattern[0].upper() + templatePattern[0].lower() + ']' + templatePattern[1:] + templatePattern = re.sub(' ', '[_ ]', templatePattern) + templatePatterns.append(templatePattern) + templateRegex = re.compile(r'\{\{ *([mM][sS][gG]:)?(?:%s) *(?P<parameters>\|[^}]+|) *}}' % '|'.join(templatePatterns)) + + for entry in dump.parse(): + if templateRegex.search(entry.text): + page = pywikibot.Page(mysite, entry.title) + yield page + +class TemplateRobot: + """ + This robot will load all pages yielded by a page generator and replace or + remove all occurences of the old template, or substitute them with the + template's text. + """ + # Summary messages for replacing templates + msg_change={ + 'ar':u'روبوت: تغيير القالب: %s', + 'da':u'Bot: Erstatter skabelon: %s', + 'de':u'Bot: Ändere Vorlage: %s', + 'en':u'Robot: Changing template: %s', + 'es':u'Robot: Cambiada la plantilla: %s', + 'fi':u'Botti korvasi mallineen: %s', + 'fr':u'Robot : Change modèle: %s', + 'he':u'בוט: משנה תבנית: %s', + 'hu':u'Robot: Sablon csere: %s', + 'ia':u'Robot: Modification del template: %s', + 'kk':u'Бот: Мына үлгі өзгертілді: %s', + 'lt':u'robotas: Keičiamas šablonas: %s', + 'nds':u'Bot: Vörlaag utwesselt: %s', + 'ja':u'ロボットによるテンプレートの張り替え : %s', + 'nl':u'Bot: vervangen sjabloon: %s', + 'no':u'bot: Endrer mal: %s', + 'pl':u'Robot zmienia szablon: %s', + 'pt':u'Bot: Alterando predefinição: %s', + 'ru':u'Робот: замена шаблона: %s', + 'sr':u'Бот: Измена шаблона: %s', + 'uk':u'Робот: заміна шаблону: %s', + 'zh':u'機器人: 更改模板 %s', + } + + #Needs more translations! + msgs_change={ + 'ar':u'روبوت: تغيير القوالب: %s', + 'da':u'Bot: Erstatter skabeloner: %s', + 'de':u'Bot: Ändere Vorlagen: %s', + 'en':u'Robot: Changing templates: %s', + 'es':u'Robot: Cambiando las plantillas: %s', + 'fi':u'Botti korvasi mallineet: %s', + 'fr':u'Robot : Modifie modèles %s', + 'he':u'בוט: משנה תבניות: %s', + 'kk':u'Бот: Мына үлгілер өзгертілді: %s', + 'lt':u'robotas: Keičiami šablonai: %s', + 'nds':u'Bot: Vörlagen utwesselt: %s', + 'ja':u'ロボットによるテンプレートの張り替え : %s', + 'nl':u'Bot: vervangen sjablonen: %s', + 'no':u'bot: Endrer maler: %s', + 'pl':u'Robot zmienia szablony: %s', + 'pt':u'Bot: Alterando predefinição: %s', + 'ru':u'Робот: замена шаблонов: %s', + 'uk':u'Робот: заміна шаблонів: %s', + 'zh':u'機器人: 更改模板 %s', + } + + # Summary messages for removing templates + msg_remove={ + 'ar':u'روبوت: إزالة القالب: %s', + 'da':u'Bot: Fjerner skabelon: %s', + 'de':u'Bot: Entferne Vorlage: %s', + 'en':u'Robot: Removing template: %s', + 'es':u'Robot: Retirando la plantilla: %s', + 'fi':u'Botti poisti mallineen: %s', + 'fr':u'Robot : Enlève le modèle: %s', + 'he':u'בוט: מסיר תבנית: %s', + 'hu':u'Robot: Sablon eltávolítása: %s', + 'kk':u'Бот: Мына үлгі аластатылды: %s', + 'ia':u'Robot: Elimination del template: %s', + 'lt':u'robotas: Šalinamas šablonas: %s', + 'nds':u'Bot: Vörlaag rut: %s', + 'ja':u'ロボットによるテンプレートの除去 : %s', + 'nl':u'Bot: verwijderen sjabloon: %s', + 'no':u'bot: Fjerner mal: %s', + 'pl':u'Robot usuwa szablon: %s', + 'pt':u'Bot: Removendo predefinição: %s', + 'ru':u'Робот: удаление шаблона: %s', + 'sr':u'Бот: Уклањање шаблона: %s', + 'uk':u'Робот: видалення шаблону: %s', + 'zh':u'機器人: 移除模板 %s', + } + + #Needs more translations! + msgs_remove={ + 'ar':u'روبوت: إزالة القوالب: %s', + 'da':u'Bot: Fjerner skabeloner: %s', + 'de':u'Bot: Entferne Vorlagen: %s', + 'en':u'Robot: Removing templates: %s', + 'es':u'Robot: Retirando las plantillas: %s', + 'fi':u'Botti poisti mallineet: %s', + 'he':u'בוט: מסיר תבניות: %s', + 'fr':u'Robot : Enlève modèles : %s', + 'kk':u'Бот: Мына үлгілер аластатылды: %s', + 'lt':u'robotas: Šalinami šablonai: %s', + 'nds':u'Bot: Vörlagen rut: %s', + 'ja':u'ロボットによるテンプレートの除去 : %s', + 'nl':u'Bot: verwijderen sjablonen: %s', + 'no':u'bot: Fjerner maler: %s', + 'pl':u'Robot usuwa szablony: %s', + 'ru':u'Робот: удаление шаблонов: %s', + 'pt':u'Bot: Removendo predefinição: %s', + 'uk':u'Робот: видалення шаблонів: %s', + 'zh':u'機器人: 移除模板 %s', + } + + # Summary messages for substituting templates + #Needs more translations! + msg_subst={ + 'ar':u'روبوت: نسخ القالب: %s', + 'da':u'Bot: Substituerer skabelon: %s', + 'de':u'Bot: Umgehe Vorlage: %s', + 'en':u'Robot: Substituting template: %s', + 'es':u'Robot: Sustituyendo la plantilla: %s', + 'fi':u'Botti substasi mallineen: %s', + 'fr':u'Robot : Remplace modèle : %s', + 'he':u'בוט: מכליל תבנית בקוד הדף: %s', + 'kk':u'Бот: Мына үлгі бәделдірленді: %s', + 'nds':u'Bot: Vörlaag in Text övernahmen: %s', + 'ja':u'ロボットによるテンプレートの置換 : %s', + 'nl':u'Bot: substitueren sjabloon: %s', + 'no':u'bot: Erstatter mal: %s', + 'pl':u'Robot podmienia szablon: %s', + 'pt':u'Bot: Substituindo predefinição: %s', + 'ru':u'Робот: подстановка шаблона: %s', + 'uk':u'Робот: підстановка шаблону: %s', + 'zh':u'機器人: 更換模板 %s', + } + + #Needs more translations! + msgs_subst={ + 'ar':u'روبوت: نسخ القوالب: %s', + 'da':u'Bot: Substituerer skabeloner: %s', + 'de':u'Bot: Umgehe Vorlagen: %s', + 'en':u'Robot: Substituting templates: %s', + 'es':u'Robot: Sustituyendo las plantillas: %s', + 'fi':u'Botti substasi mallineet: %s', + 'fr':u'Robot : Remplace modèles : %s', + 'he':u'בוט: מכליל תבניות בקוד הדף: %s', + 'kk':u'Бот: Мына үлгілер бәделдірленді: %s', + 'nds':u'Bot: Vörlagen in Text övernahmen: %s', + 'ja':u'ロボットによるテンプレートの置換 : %s', + 'nl':u'Bot: substitueren sjablonen: %s', + 'no':u'bot: Erstatter maler: %s', + 'pl':u'Robot podmienia szablony: %s', + 'pt':u'Bot: Substituindo predefinição: %s', + 'ru':u'Робот: подстановка шаблонов: %s', + 'uk':u'Робот: підстановка шаблонів: %s', + 'zh':u'機器人: 更換模板 %s', + } + + def __init__(self, generator, templates, subst = False, remove = False, editSummary = '', + acceptAll = False, addedCat = None): + """ + Arguments: + * generator - A page generator. + * replacements - A dictionary which maps old template names to + their replacements. If remove or subst is True, + it maps the names of the templates that should be + removed/resolved to None. + * remove - True if the template should be removed. + * subst - True if the template should be resolved. + """ + self.generator = generator + self.templates = templates + self.subst = subst + self.remove = remove + self.editSummary = editSummary + self.acceptAll = acceptAll + self.addedCat = addedCat + if self.addedCat: + self.addedCat = catlib.Category(pywikibot.getSite(), 'Category:' + self.addedCat) + + # get edit summary message if it's empty + if (self.editSummary==''): + oldTemplateNames = (', ').join(self.templates.keys()) + mysite = pywikibot.getSite() + if self.remove: + if len(self.templates) > 1: + self.editSummary = pywikibot.translate(mysite, self.msgs_remove) % oldTemplateNames + else: + self.editSummary = pywikibot.translate(mysite, self.msg_remove) % oldTemplateNames + elif self.subst: + if len(self.templates) > 1: + self.editSummary = pywikibot.translate(mysite, self.msgs_subst) % oldTemplateNames + else: + self.editSummary = pywikibot.translate(mysite, self.msg_subst) % oldTemplateNames + else: + if len(self.templates) > 1: + self.editSummary = pywikibot.translate(mysite, self.msgs_change) % oldTemplateNames + else: + self.editSummary = pywikibot.translate(mysite, self.msg_change) % oldTemplateNames + + def run(self): + """ + Starts the robot's action. + """ + # regular expression to find the original template. + # {{vfd}} does the same thing as {{Vfd}}, so both will be found. + # The old syntax, {{msg:vfd}}, will also be found. + # The group 'parameters' will either match the parameters, or an + # empty string if there are none. + + replacements = [] + exceptions = {} + + for old, new in self.templates.iteritems(): + if not pywikibot.getSite().nocapitalize: + pattern = '[' + re.escape(old[0].upper()) + re.escape(old[0].lower()) + ']' + re.escape(old[1:]) + else: + pattern = re.escape(old) + pattern = re.sub(r'_|\\ ', r'[_ ]', pattern) + templateRegex = re.compile(r'\{\{ *([Tt]emplate:|[mM][sS][gG]:)?' + pattern + r'(?P<parameters>\s*\|.+?|) *}}', re.DOTALL) + + if self.remove: + replacements.append((templateRegex, '')) + elif self.subst: + replacements.append((templateRegex, '{{subst:' + old + '\g<parameters>}}')) + exceptions['inside-tags']=['ref'] + else: + replacements.append((templateRegex, '{{' + new + '\g<parameters>}}')) + + replaceBot = replace.ReplaceRobot(self.generator, replacements, exceptions, acceptall = self.acceptAll, addedCat=self.addedCat, editSummary=self.editSummary) + replaceBot.run() + +def main(): + templateNames = [] + templates = {} + subst = False + remove = False + namespaces = [] + editSummary = '' + addedCat = '' + acceptAll = False + genFactory = pagegenerators.GeneratorFactory() + # If xmlfilename is None, references will be loaded from the live wiki. + xmlfilename = None + # read command line parameters + for arg in pywikibot.handleArgs(): + if arg == '-remove': + remove = True + elif arg == '-subst': + subst = True + elif arg.startswith('-xml'): + if len(arg) == 4: + xmlfilename = pywikibot.input(u'Please enter the XML dump\'s filename: ') + else: + xmlfilename = arg[5:] + elif arg.startswith('-namespace:'): + try: + namespaces.append(int(arg[len('-namespace:'):])) + except ValueError: + namespaces.append(arg[len('-namespace:'):]) + elif arg.startswith('-category:'): + addedCat = arg[len('-category:'):] + elif arg.startswith('-summary:'): + editSummary = arg[len('-summary:'):] + elif arg.startswith('-always'): + acceptAll = True + else: + if not genFactory.handleArg(arg): + templateNames.append(pywikibot.Page(pywikibot.getSite(), arg, defaultNamespace=10).titleWithoutNamespace()) + + if subst or remove: + for templateName in templateNames: + templates[templateName] = None + else: + try: + for i in range(0, len(templateNames), 2): + templates[templateNames[i]] = templateNames[i + 1] + except IndexError: + pywikibot.output(u'Unless using -subst or -remove, you must give an even number of template names.') + return + + oldTemplates = [] + ns = pywikibot.getSite().template_namespace() + for templateName in templates.keys(): + oldTemplate = pywikibot.Page(pywikibot.getSite(), templateName, defaultNamespace=10) + oldTemplates.append(oldTemplate) + + if xmlfilename: + gen = XmlDumpTemplatePageGenerator(oldTemplates, xmlfilename) + else: + gen = genFactory.getCombinedGenerator() + if not gen: + gens = [] + gens = [pagegenerators.ReferringPageGenerator(t, onlyTemplateInclusion = True) for t in oldTemplates] + gen = pagegenerators.CombinedPageGenerator(gens) + gen = pagegenerators.DuplicateFilterPageGenerator(gen) + + if namespaces: + gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) + + preloadingGen = pagegenerators.PreloadingGenerator(gen) + + bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary, acceptAll, addedCat) + bot.run() + +if __name__ == "__main__": + try: + main() + finally: + pywikibot.stopme()

1 0

SVN: [8051] trunk/pywikipedia
by mfarag＠svn.wikimedia.org 04 Apr '10

04 Apr '10

Revision: 8051 Author: mfarag Date: 2010-04-04 15:33:15 +0000 (Sun, 04 Apr 2010) Log Message: ----------- update i18n Modified Paths: -------------- trunk/pywikipedia/casechecker.py trunk/pywikipedia/category.py trunk/pywikipedia/category_redirect.py trunk/pywikipedia/checkimages.py trunk/pywikipedia/copyright.py trunk/pywikipedia/djvutext.py trunk/pywikipedia/featured.py trunk/pywikipedia/redirect.py trunk/pywikipedia/reflinks.py trunk/pywikipedia/speedy_delete.py trunk/pywikipedia/standardize_notes.py Modified: trunk/pywikipedia/casechecker.py =================================================================== --- trunk/pywikipedia/casechecker.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/casechecker.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -64,6 +64,7 @@ class CaseChecker( object ): msgRename = { + 'ar': u'تغيير اسم لحالة مخلوطة', 'en': u'mixed case rename', 'ru': u'[[ВП:КЛ]]', } Modified: trunk/pywikipedia/category.py =================================================================== --- trunk/pywikipedia/category.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/category.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -167,6 +167,7 @@ } msg_replace={ + 'ar':u'روبوت: استبدال التصنيف %(oldcat)s ب %(newcat)s', 'cs':u'Robot nahradil kategorii %(oldcat)s za %(newcat)s', 'de':u'Bot: Ersetze Kategorie %(oldcat)s durch %(newcat)s', 'en':u'Robot: Replacing category %(oldcat)s with %(newcat)s', Modified: trunk/pywikipedia/category_redirect.py =================================================================== --- trunk/pywikipedia/category_redirect.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/category_redirect.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -169,6 +169,7 @@ self.edit_request_item = pywikibot.translate(self.site.lang, { + 'ar': u"* %s موجودة في %s, وهي تحويلة إلى %s", 'en': u"* %s is in %s, which is a redirect to %s", 'fr': u"* %s est dans %s, qui est une redirection vers %s", 'ksh': u"* %s es en %s, un dat es en Ömleidung op %s", Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/checkimages.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -307,7 +307,7 @@ # The text added in the report report_text = { 'commons':u"\n*[[:File:%s]] " + timeselected, - 'ar':u"\n*[[:صورة:%s]] " + timeselected, + 'ar':u"\n*[[:ملف:%s]] " + timeselected, 'de':u"\n*[[:Bild:%s]] " + timeselected, 'en':u"\n*[[:File:%s]] " + timeselected, 'ga':u"\n*[[:File:%s]] " + timeselected, @@ -403,12 +403,14 @@ duplicates_comment_talk = { '_default':None, 'commons': u'Bot: Dupe file found', + 'ar' : u'بوت: ملف مكرر تم العثور عليه', 'it' : u"Bot: Notifico il file doppio trovato", } # Comment used by the bot while it reports the problem in the image duplicates_comment_image = { '_default':None, 'commons': u'Bot: Tagging dupe file', + 'ar' : u'بوت: وسم ملف مكرر', 'it' : u'Bot: File doppio, da cancellare', } # Regex to detect the template put in the image's decription to find the dupe Modified: trunk/pywikipedia/copyright.py =================================================================== --- trunk/pywikipedia/copyright.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/copyright.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -246,6 +246,7 @@ } sections_to_skip = { + 'ar':['مراجع', 'قراءة أخرى', 'ملاحظات', 'وصلات خارجية'], 'en':['References', 'Further reading', 'Citations', 'External links'], 'es':[u'Referencias', u'Ver también', u'Bibliografía', u'Enlaces externos', u'Notas'], 'fr':['Liens externes'], Modified: trunk/pywikipedia/djvutext.py =================================================================== --- trunk/pywikipedia/djvutext.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/djvutext.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -37,8 +37,8 @@ # Edit summary message that should be used. # NOTE: Put a good description here, and add translations, if possible! msg = { + 'ar': u'روبوت: إنشاء صفحة بنص مستخرج من DjVu', 'en': u'Robot: creating page with text extracted from DjVu', - 'ar': u'روبوت: إنشاء صفحة بنص مستخرج من DjVu', 'fr': u'Bot: Creating page with texte extracted from DjVu', 'nl': u'Bot: pagina aangemaakt met tekst geëxtraheerd uit DjVu-bestand', 'pt': u'Bot: criando página com texto extraído do DjVu', Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/featured.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -124,6 +124,7 @@ msg_lists = { 'als':u'Bötli: [[%s:%s]] isch e bsunders glungene Lischte', + 'ar': u'بوت: [[%s:%s]] هي قائمة مختارة', 'de': u'Bot: [[%s:%s]] ist eine informative Liste', 'en': u'Bot: [[%s:%s]] is a featured list', 'es': u'Bot: Enlace a lista destacado para: [[%s:%s]]', @@ -325,6 +326,7 @@ } lists_name = { + 'ar': (BACK, u'قائمة مختارة'), 'da': (BACK, u'FremragendeListe'), 'de': (BACK, u'Informativ'), 'en': (BACK, u'Featured list'), Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/redirect.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -152,6 +152,7 @@ # Reason for deleting redirect loops reason_loop={ + 'ar': u'بوت: هدف التحويلة يصنع عقدة تحويل', 'de': u'Bot: Weiterleitungsziel auf sich selbst', 'en': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] target forms a redirect loop', } Modified: trunk/pywikipedia/reflinks.py =================================================================== --- trunk/pywikipedia/reflinks.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/reflinks.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -123,6 +123,7 @@ } autogen = { 'en': 'autogenerated', + 'ar': 'مولد تلقائيا', 'it': 'autogenerato', 'pl': 'autonazwa', } Modified: trunk/pywikipedia/speedy_delete.py =================================================================== --- trunk/pywikipedia/speedy_delete.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/speedy_delete.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -251,7 +251,7 @@ deletion_messages = { 'wikipedia':{ 'ar': { - u'_default': u'حذف مرشح للحذف السريع حسب [[ويكيبيديا:حذف سريع|معايير الحذف السريع]]', + u'_default': u'حذف مرشح للحذف السريع حسب [[وProject:حذف سريع|معايير الحذف السريع]]', }, 'cs': { u'_default': u'Bylo označeno k [[Wikipedie:Rychlé smazání|rychlému smazání]]', Modified: trunk/pywikipedia/standardize_notes.py =================================================================== --- trunk/pywikipedia/standardize_notes.py 2010-04-01 15:43:14 UTC (rev 8050) +++ trunk/pywikipedia/standardize_notes.py 2010-04-04 15:33:15 UTC (rev 8051) @@ -84,6 +84,7 @@ # all pages which contain nowiki tags. 'exceptions': ['<nowiki>[^<]{3,}</nowiki>'], 'msg': { + 'ar':u'روبوت: إضافة/ترتيب المراجع.', 'en':u'Robot: Adding/sorting references.', 'ar':u'روبوت: إضافة/ترتيب المراجع.', 'fr':u'Robot : Ajoute/trie les références.',

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn April 2010