December 2009 - Pywikipedia-svn - lists.wikimedia.org

SVN: [7799] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 19 Dec '09

19 Dec '09

Revision: 7799 Author: xqt Date: 2009-12-19 11:02:56 +0000 (Sat, 19 Dec 2009) Log Message: ----------- actualized family files Modified Paths: -------------- trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wikiversity_family.py Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2009-12-19 10:45:30 UTC (rev 7798) +++ trunk/pywikipedia/families/wikisource_family.py 2009-12-19 11:02:56 UTC (rev 7799) @@ -339,8 +339,6 @@ self.obsolete = { 'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ol… - - 'dk': 'da', 'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ha… 'jp': 'ja', Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2009-12-19 10:45:30 UTC (rev 7798) +++ trunk/pywikipedia/families/wikiversity_family.py 2009-12-19 11:02:56 UTC (rev 7799) @@ -12,7 +12,7 @@ self.languages_by_size = [ 'en', 'fr', 'de', 'beta', 'cs', 'es', 'it', 'pt', 'el', 'fi', - 'ja', + 'ja', 'ru', ] if family.config.SSL_connection:

1 0

SVN: [7798] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 19 Dec '09

19 Dec '09

Revision: 7798 Author: xqt Date: 2009-12-19 10:45:30 +0000 (Sat, 19 Dec 2009) Log Message: ----------- languages_by_size act. Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-12-18 17:24:46 UTC (rev 7797) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-12-19 10:45:30 UTC (rev 7798) @@ -14,7 +14,7 @@ 'en', 'de', 'fr', 'pl', 'it', 'ja', 'nl', 'es', 'pt', 'ru', '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', 'ms', 'new', 'simple', 'gl', + 'lt', 'fa', 'bg', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', 'la', 'br', 'az', 'bs', 'lb', 'is', 'sh', 'mr', 'cy', 'sq', 'bpy', 'lv', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'oc', 'ta', 'be', @@ -23,16 +23,16 @@ 'ksh', 'ga', 'tg', 'roa-tara', 'vec', 'gd', 'kn', 'uz', 'pam', 'lmo', 'yi', 'mi', 'zh-min-nan', 'nah', 'glk', 'hsb', 'hy', 'co', 'kk', 'als', 'roa-rup', 'sah', 'li', 'ia', 'tt', 'bcl', 'gan', 'os', 'arz', 'nds-nl', - 'tk', 'fiu-vro', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', 'pag', + 'fiu-vro', 'tk', 'vls', 'sa', 'fo', 'mn', 'am', 'nrm', 'dv', 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'ne', 'yo', 'bar', 'my', 'sco', 'se', 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', 'ilo', 'pi', 'zh-classical', 'km', 'lad', 'ug', 'frp', 'sc', 'ang', 'mg', - 'kw', 'haw', 'pdc', 'ps', 'szl', 'kv', 'to', 'pa', 'ie', 'hak', - 'hif', 'myv', 'bo', 'gn', 'crh', 'ln', 'stq', 'nv', 'arc', 'jbo', + 'kw', 'haw', 'pdc', 'ps', 'szl', 'kv', 'pa', 'to', 'hak', 'ie', + 'hif', 'bo', 'myv', 'gn', 'crh', 'ln', 'stq', 'nv', 'arc', 'jbo', 'wo', 'ace', 'ext', 'mhr', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', 'zea', 'srn', 'ay', 'pap', 'ckb', 'ig', 'kab', 'kg', 'or', 'lo', - 'ba', 'udm', 'dsb', 'rmy', 'kaa', 'cu', 'ce', 'sm', 'ks', 'av', - 'tet', 'got', 'xal', 'sd', 'ab', 'mdf', 'na', 'iu', 'pnt', 'bm', + 'ba', 'udm', 'dsb', 'rmy', 'kaa', 'ce', 'cu', 'sm', 'ks', 'av', + 'tet', 'got', 'xal', 'sd', 'ab', 'mdf', 'na', 'pnt', 'iu', 'bm', 'kl', 'pih', 'as', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', 'ch', 'bug', 'xh', 'tn', 'ki', 'st', 'ik', 'rw', 'ny', 'tw', 'ak',

1 0

SVN: [7797] trunk/pywikipedia/maintenance/wikimedia_sites.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7797 Author: xqt Date: 2009-12-18 17:24:46 +0000 (Fri, 18 Dec 2009) Log Message: ----------- use wikipedia.output() and fetch it from the log Modified Paths: -------------- trunk/pywikipedia/maintenance/wikimedia_sites.py Modified: trunk/pywikipedia/maintenance/wikimedia_sites.py =================================================================== --- trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-18 13:17:47 UTC (rev 7796) +++ trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-18 17:24:46 UTC (rev 7797) @@ -42,10 +42,10 @@ new.append(lang) if original == new: - print 'The lists match!' + wikipedia.output(u'The lists match!') else: - print "The lists don't match, the new list is:" - print ' self.languages_by_size = [' + wikipedia.output(u"The lists don't match, the new list is:") + wikipedia.output(u' self.languages_by_size = [') line = ' ' index = 0 for lang in new: @@ -54,9 +54,9 @@ line += u' ' line += u"'%s'," % lang if index == 10: - print line + wikipedia.output(u'%s' % line) line = ' ' index = 0 if index > 0: - print line - print ' ]' + wikipedia.output(u'%s' % line) + wikipedia.output(u' ]')

1 0

SVN: [7796] trunk/pywikipedia/family.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7796 Author: xqt Date: 2009-12-18 13:17:47 +0000 (Fri, 18 Dec 2009) Log Message: ----------- Add "strategy" to known_families Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2009-12-18 12:04:54 UTC (rev 7795) +++ trunk/pywikipedia/family.py 2009-12-18 13:17:47 UTC (rev 7796) @@ -2975,6 +2975,7 @@ 'sourceforge': 'sourceforge', 'sourcextreme': 'sourcextreme', 'squeak': 'squeak', + 'strategy': 'strategy', 'stockphotoss': 'stockphotoss', 'strikiwiki': 'strikiwiki', 'susning': 'susning',

1 0

SVN: [7795] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7795 Author: xqt Date: 2009-12-18 12:04:54 +0000 (Fri, 18 Dec 2009) Log Message: ----------- increase idle time for gateway timeouts Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-18 11:24:00 UTC (rev 7794) +++ trunk/pywikipedia/wikipedia.py 2009-12-18 12:04:54 UTC (rev 7795) @@ -5810,6 +5810,7 @@ % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) # Next time wait longer, but not longer than half an hour + retry_idle_time *= 2 if retry_idle_time > 30: retry_idle_time = 30 continue @@ -5823,7 +5824,6 @@ output(u"""WARNING: Could not open '%s'. Maybe the server or\n your connection is down. Retrying in %i minutes...""" % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) - # Next time wait longer, but not longer than half an hour retry_idle_time *= 2 if retry_idle_time > 30: retry_idle_time = 30 @@ -5953,6 +5953,7 @@ % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) # Next time wait longer, but not longer than half an hour + retry_idle_time *= 2 if retry_idle_time > 30: retry_idle_time = 30 continue

1 0

SVN: [7794] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7794 Author: xqt Date: 2009-12-18 11:24:00 +0000 (Fri, 18 Dec 2009) Log Message: ----------- raise ServerError() in mediawiki_message() after config.maxretries Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-18 10:12:42 UTC (rev 7793) +++ trunk/pywikipedia/wikipedia.py 2009-12-18 11:24:00 UTC (rev 7794) @@ -6362,6 +6362,7 @@ _dict = dict retry_idle_time = 1 + retry_attempt = 0 while True: if api and self.versionnumber() >= 12 or self.versionnumber() >= 16: params = { @@ -6415,6 +6416,9 @@ output(u'WARNING: No messages found in Special:Allmessages. Maybe the server is down. Retrying in %i minutes...' % retry_idle_time) time.sleep(retry_idle_time * 60) # Next time wait longer, but not longer than half an hour + retry_attempt += 1 + if retry_attempt > config.maxretries: + raise ServerError() retry_idle_time *= 2 if retry_idle_time > 30: retry_idle_time = 30

1 0

SVN: [7793] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

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

1 0

SVN: [7792] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7792 Author: xqt Date: 2009-12-18 10:02:12 +0000 (Fri, 18 Dec 2009) Log Message: ----------- family files actualized Modified Paths: -------------- trunk/pywikipedia/families/wikibooks_family.py trunk/pywikipedia/families/wikiquote_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2009-12-18 09:36:21 UTC (rev 7791) +++ trunk/pywikipedia/families/wikibooks_family.py 2009-12-18 10:02:12 UTC (rev 7792) @@ -48,6 +48,7 @@ 'el': u'Βικιβιβλία', 'eo': u'Vikilibroj', 'es': u'Wikilibros', + 'et': u'Vikiõpikud', 'fa': u'ویکی‌نسک', 'fi': u'Wikikirjasto', 'fr': u'Wikilivres', @@ -101,7 +102,7 @@ 'el': u'Βικιβιβλία συζήτηση', 'eo': u'Vikilibroj diskuto', 'es': u'Wikilibros Discusión', - 'et': u'Wikibooks arutelu', + 'et': u'Vikiõpikute arutelu', 'eu': u'Wikibooks eztabaida', 'fa': u'بحث ویکی‌نسک', 'fi': u'Keskustelu Wikikirjastosta', @@ -203,6 +204,7 @@ } self.namespaces[102] = { + 'ca': u'Viquiprojecte', 'cy': u'Silff lyfrau', 'de': u'Regal', 'en': u'Cookbook', @@ -217,6 +219,7 @@ } self.namespaces[103] = { + 'ca': u'Viquiprojecte Discussió', 'cy': u'Sgwrs Silff lyfrau', 'de': u'Regal Diskussion', 'en': u'Cookbook talk', Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2009-12-18 09:36:21 UTC (rev 7791) +++ trunk/pywikipedia/families/wikiquote_family.py 2009-12-18 10:02:12 UTC (rev 7792) @@ -40,6 +40,7 @@ 'cs': u'Wikicitáty', 'el': u'Βικιφθέγματα', 'eo': u'Vikicitaro', + 'et': u'Vikitsitaadid', 'fa': u'ویکی‌گفتاورد', 'fi': u'Wikisitaatit', 'ga': u'Vicísliocht', @@ -86,7 +87,7 @@ 'el': u'Βικιφθέγματα συζήτηση', 'eo': u'Vikicitaro diskuto', 'es': u'Wikiquote Discusión', - 'et': u'Wikiquote arutelu', + 'et': u'Vikitsitaatide arutelu', 'eu': u'Wikiquote eztabaida', 'fa': u'بحث ویکی‌گفتاورد', 'fi': u'Keskustelu Wikisitaateista', Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2009-12-18 09:36:21 UTC (rev 7791) +++ trunk/pywikipedia/families/wikisource_family.py 2009-12-18 10:02:12 UTC (rev 7792) @@ -89,7 +89,7 @@ 'de': u'Wikisource Diskussion', 'el': u'Βικιθήκη συζήτηση', 'es': u'Wikisource Discusión', - 'et': u'Vikitekstid arutelu', + 'et': u'Vikitekstide arutelu', 'fa': u'بحث ویکی‌نبشته', 'fi': u'Keskustelu Wikiaineistosta', 'fo': u'Wikiheimild-kjak', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2009-12-18 09:36:21 UTC (rev 7791) +++ trunk/pywikipedia/families/wiktionary_family.py 2009-12-18 10:02:12 UTC (rev 7792) @@ -46,6 +46,8 @@ 'ar': u'ويكاموس', 'ast': u'Uiccionariu', 'bg': u'Уикиречник', + 'bn': u'উইকিঅভিধান', + 'br': u'Wikeriadur', 'bs': u'Vikirječnik', 'ca': u'Viccionari', 'cs': u'Wikislovník', @@ -53,7 +55,7 @@ 'el': u'Βικιλεξικό', 'eo': u'Vikivortaro', 'es': u'Wikcionario', - 'et': u'Vikisõnaraamat', + 'et': u'Vikisõnastik', 'fa': u'ویکی‌واژه', 'fi': u'Wikisanakirja', 'fo': u'Wiktionary', @@ -114,8 +116,8 @@ 'be': u'Wiktionary размовы', 'bg': u'Уикиречник беседа', 'bm': u'Discussion Wiktionary', - 'bn': u'Wiktionary আলোচনা', - 'br': u'Kaozeadenn Wiktionary', + 'bn': u'উইকিঅভিধান আলোচনা', + 'br': u'Kaozeadenn Wikeriadur', 'bs': u'Razgovor s Vikirječnikom', 'ca': u'Viccionari Discussió', 'cs': u'Wikislovník diskuse', @@ -126,7 +128,7 @@ 'el': u'Συζήτηση βικιλεξικού', 'eo': u'Vikivortaro diskuto', 'es': u'Wikcionario Discusión', - 'et': u'Vikisõnaraamat arutelu', + 'et': u'Vikisõnastiku arutelu', 'eu': u'Wiktionary eztabaida', 'fa': u'بحث ویکی‌واژه', 'fi': u'Keskustelu Wikisanakirjasta', @@ -277,6 +279,7 @@ 'de': u'Verzeichnis', 'en': u'Concordance', 'fr': u'Transwiki', + 'ia': u'Appendice', 'pl': u'Indeks', 'pt': u'Vocabulário', 'ro': u'Apendice', @@ -291,6 +294,7 @@ 'de': u'Verzeichnis Diskussion', 'en': u'Concordance talk', 'fr': u'Discussion Transwiki', + 'ia': u'Discussion Appendice', 'pl': u'Dyskusja indeksu', 'pt': u'Vocabulário Discussão', 'ro': u'Discuţie Apendice', @@ -341,10 +345,12 @@ self.namespaces[108] = { 'en': u'Transwiki', + 'pt': u'Citações', } self.namespaces[109] = { 'en': u'Transwiki talk', + 'pt': u'Citações Discussão', } self.namespaces[110] = {

1 0

SVN: [7791] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7791 Author: xqt Date: 2009-12-18 09:36:21 +0000 (Fri, 18 Dec 2009) Log Message: ----------- Appendix namespace for ia-wiki Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-12-18 06:06:49 UTC (rev 7790) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-12-18 09:36:21 UTC (rev 7791) @@ -515,6 +515,7 @@ 'fi': u'Metasivu', 'fr': u'Projet', 'hr': u'Dodatak', + 'ia': u'Appendice', 'it': u'Progetto', 'lmo': u'Purtaal', 'lt': u'Vikiprojektas', @@ -536,6 +537,7 @@ 'fi': u'Keskustelu metasivusta', 'fr': u'Discussion Projet', 'hr': u'Razgovor o dodatku', + 'ia': u'Discussion Appendice', 'it': u'Discussioni progetto', 'lmo': u'Descüssiun Purtaal', 'lt': u'Vikiprojekto aptarimas',

1 0

SVN: [7790] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 18 Dec '09

18 Dec '09

Revision: 7790 Author: xqt Date: 2009-12-18 06:06:49 +0000 (Fri, 18 Dec 2009) Log Message: ----------- additional output indicating api processing Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-17 19:20:12 UTC (rev 7789) +++ trunk/pywikipedia/redirect.py 2009-12-18 06:06:49 UTC (rev 7790) @@ -285,6 +285,7 @@ params['apfrom'] = self.api_start done = False while not done: + wikipedia.output(u'\nRetrieving pages...', newline=False) data = query.GetData(params, self.site) if "limits" in data: # process aplimit = max params['aplimit'] = int(data['limits']['allpages']) @@ -340,6 +341,7 @@ } for apiQ in self._next_redirects_via_api_commandline(): params['pageids'] = apiQ + wikipedia.output(u'.', newline=False) data = query.GetData(params, self.site) if 'error' in data: raise RuntimeError("API query error: %s" % data)

1 0

SVN: [7789] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7789 Author: xqt Date: 2009-12-17 19:20:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- * change comparison that title not have to exist; * break outer loop in get_redirect_pageids_via_api() if title >= api_until * raise API error and empty results * put move_regex into the function Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-17 18:13:05 UTC (rev 7788) +++ trunk/pywikipedia/redirect.py 2009-12-17 19:20:12 UTC (rev 7789) @@ -283,16 +283,16 @@ params['apnamespace'] = ns if self.api_start: params['apfrom'] = self.api_start - while True: + done = False + while not done: data = query.GetData(params, self.site) if "limits" in data: # process aplimit = max params['aplimit'] = int(data['limits']['allpages']) for x in data['query']['allpages']: - if self.api_until and x['title'] == self.api_until: - break + done = self.api_until and x['title'] >= self.api_until + if done: break yield x['pageid'] - - if 'query-continue' in data: + if not done and 'query-continue' in data: params['apfrom'] = data['query-continue']['allpages']['apfrom'] else: break @@ -341,6 +341,10 @@ for apiQ in self._next_redirects_via_api_commandline(): params['pageids'] = apiQ data = query.GetData(params, self.site) + if 'error' in data: + raise RuntimeError("API query error: %s" % data) + if data == []: + raise RuntimeError("No results given.") redirects = {} pages = {} redirects = dict((x['from'], x['to']) @@ -452,14 +456,14 @@ wikipedia.output(u'\nChecking redirect %i of %i...' % (num + 1, len(redict))) - move_regex = re.compile( - r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') - def get_moved_pages_redirects(self): '''generate redirects to recently-moved pages''' # this will run forever, until user interrupts it import datetime + move_regex = re.compile( + r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') + if self.offset <= 0: self.offset = 1 offsetpattern = re.compile( @@ -482,7 +486,7 @@ import traceback wikipedia.output(unicode(traceback.format_exc())) return - g = self.move_regex.findall(move_list) + g = move_regex.findall(move_list) if wikipedia.verbose: wikipedia.output(u"%s moved pages" % len(g)) for moved_title in g: @@ -684,8 +688,7 @@ sd_tagging_sum) targetPage.put(content, summ) redir.put(content, summ) - else: - break # TODO Better implement loop redirect + break # TODO Better implement loop redirect else: newRedir = targetPage continue #

1 0

SVN: [7788] trunk/pywikipedia/redirect.py
by russblau＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7788 Author: russblau Date: 2009-12-17 18:13:05 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Refactor: Python is an object-oriented language; it makes no sense to pass around object attributes as arguments to the object's own methods. Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-17 15:18:04 UTC (rev 7787) +++ trunk/pywikipedia/redirect.py 2009-12-17 18:13:05 UTC (rev 7788) @@ -187,6 +187,8 @@ self.site = wikipedia.getSite() self.xmlFilename = xmlFilename self.namespaces = namespaces + if use_api and self.namespaces == []: + self.namespaces = [ 0 ] self.offset = offset self.use_move_log = use_move_log self.use_api = use_api @@ -263,35 +265,30 @@ else: return redict - def get_redirect_pageids_via_api(self, number=u'max', namespaces=[], - start=None, until=None): + def get_redirect_pageids_via_api(self): """ - Generator which will yield page IDs of Pages that are redirects. - Get number of page ids in one go. - Iterates over namespaces, Main if an empty list. - In each namespace, start alphabetically from a pagetitle start, - which need not exist. + Return generator that yields page IDs of Pages that are redirects. """ - if namespaces == []: - namespaces = [ 0 ] params = { - 'action':'query', - 'list':'allpages', - 'apfilterredir':'redirects', - 'aplimit':number, - 'apdir':'ascending', + 'action': 'query', + 'list': 'allpages', + 'apfilterredir': 'redirects', + 'aplimit': self.api_number, + 'apdir': 'ascending', #'':'', } - for ns in namespaces: + if self.api_number is None: + params['aplimit'] = "max" + for ns in self.namespaces: params['apnamespace'] = ns - if start: - params['apfrom'] = start + if self.api_start: + params['apfrom'] = self.api_start while True: data = query.GetData(params, self.site) if "limits" in data: # process aplimit = max params['aplimit'] = int(data['limits']['allpages']) for x in data['query']['allpages']: - if until and x['title'] == until: + if self.api_until and x['title'] == self.api_until: break yield x['pageid'] @@ -300,17 +297,13 @@ else: break - def _next_redirects_via_api_commandline(self, number='max', namespaces=[], - start=None, until=None ): + def _next_redirects_via_api_commandline(self): """ Return a generator that retrieves pageids from the API 500 at a time and yields them as a list """ - if namespaces == []: - namespaces = [ 0 ] apiQ = [] - for pageid in self.get_redirect_pageids_via_api(number, namespaces, - start, until): + for pageid in self.get_redirect_pageids_via_api(): apiQ.append(pageid) if len(apiQ) >= 500: yield apiQ @@ -318,8 +311,7 @@ if apiQ: yield apiQ - def get_redirects_via_api(self, number=u'max', namespaces=[], start=None, - until=None, maxlen=8): + def get_redirects_via_api(self, maxlen=8): """ Return a generator that yields tuples of data about redirect Pages: 0 - page title of a redirect page @@ -339,21 +331,14 @@ 2 - target page title of the redirect, or chain (may not exist) 3 - target page of the redirect, or end of chain, or page title where chain or loop detecton was halted, or None if unknown - Get number of page ids in one go. - Iterates over namespaces, Main if an empty list. - In each namespace, start alphabetically from a pagetitle start, which - need not exist. """ import urllib - if namespaces == []: - namespaces = [ 0 ] params = { 'action':'query', 'redirects':1, #'':'', } - for apiQ in self._next_redirects_via_api_commandline( - number, namespaces, start, until): + for apiQ in self._next_redirects_via_api_commandline(): params['pageids'] = apiQ data = query.GetData(params, self.site) redirects = {} @@ -389,10 +374,7 @@ if self.use_api: count = 0 for (pagetitle, type, target, final) \ - in self.get_redirects_via_api( - namespaces=self.namespaces, - start=self.api_start, - until=self.api_until, maxlen=2): + in self.get_redirects_via_api(maxlen=2): if type == 0: yield pagetitle if self.api_number: @@ -403,7 +385,7 @@ elif self.xmlFilename == None: # retrieve information from the live wiki's maintenance page # broken redirect maintenance page's URL - path = self.site.broken_redirects_address(default_limit = False) + path = self.site.broken_redirects_address(default_limit=False) wikipedia.output(u'Retrieving special page...') maintenance_txt = self.site.getUrl(path) @@ -430,9 +412,7 @@ if self.use_api: count = 0 for (pagetitle, type, target, final) \ - in self.get_redirects_via_api( - namespaces=self.namespaces, start=self.api_start, - until=self.api_until, maxlen = 2): + in self.get_redirects_via_api(maxlen=2): if type != 0 and type != 1: yield pagetitle if self.api_number: @@ -752,11 +732,7 @@ delete_reason = wikipedia.translate(self.site, reason_broken) count = 0 for (redir_name, code, target, final)\ - in self.generator.get_redirects_via_api( - namespaces=self.generator.namespaces, - start=self.generator.api_start, - until=self.generator.api_until, - maxlen = 2): + in self.generator.get_redirects_via_api(maxlen=2): if code == 1: continue elif code == 0: @@ -765,8 +741,7 @@ else: self.fix_1_double_redirect(redir_name) count += 1 - # print ('%s .. %s' % (count, self.number)) - if self.exiting or ( self.number and count >= self.number ): + if self.exiting or (self.number and count >= self.number): break def run(self):

1 0

SVN: [7787] trunk/pywikipedia/redirect.py
by russblau＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7787 Author: russblau Date: 2009-12-17 15:18:04 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Bugfix: prevent infinite loop when using -start parameter Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-17 15:15:51 UTC (rev 7786) +++ trunk/pywikipedia/redirect.py 2009-12-17 15:18:04 UTC (rev 7787) @@ -283,16 +283,13 @@ #'':'', } for ns in namespaces: - # print (ns) params['apnamespace'] = ns - # print (apiQns) + if start: + params['apfrom'] = start while True: - if start: - params['apfrom'] = start data = query.GetData(params, self.site) if "limits" in data: # process aplimit = max params['aplimit'] = int(data['limits']['allpages']) - # wikipedia.output(u'===RESULT===\n%s\n' % data) for x in data['query']['allpages']: if until and x['title'] == until: break

1 0

SVN: [7786] trunk/pywikipedia/redirect.py
by russblau＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7786 Author: russblau Date: 2009-12-17 15:15:51 +0000 (Thu, 17 Dec 2009) Log Message: ----------- Cleanup code formatting, whitespace, and break long lines; fix some incomprehensible or incorrect docstrings. Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2009-12-17 14:20:01 UTC (rev 7785) +++ trunk/pywikipedia/redirect.py 2009-12-17 15:15:51 UTC (rev 7786) @@ -69,7 +69,7 @@ # Summary message for fixing double redirects msg_double={ - 'als':u'Bötli: Uflösig vun de doppleti Wyterleitig zue %s', + 'als':u'Bötli: Uflösig vun de doppleti Wyterleitig zue %s', 'ar': u'روبوت: تصليح تحويلة مزدوجة → %s', 'bat-smg': u'Robots: Taisuoms dvėgobs paradresavėms → %s', 'be-x-old': u'Робат: выпраўленьне падвойнага перанакіраваньня → %s', @@ -121,7 +121,7 @@ 'be-x-old': u'Робат: мэта перанакіраваньня не існуе', 'cs': u'Přerušené přesměrování', 'de': u'Bot: Weiterleitungsziel existiert nicht', - 'en': u'Robot: Redirect target doesn\'t exist', + 'en': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] to a deleted or non-existent page', 'es': u'Robot: La página a la que redirige no existe', 'fa': u'ربات:تغییرمسیر مقصد ندارد', 'fi': u'Botti: Ohjauksen kohdesivua ei ole olemassa', @@ -182,10 +182,9 @@ class RedirectGenerator: def __init__(self, xmlFilename=None, namespaces=[], offset=-1, - use_move_log=False, - use_api=False, start=None, until=None, number=None): + use_move_log=False, use_api=False, start=None, until=None, + number=None): self.site = wikipedia.getSite() - self.xmlFilename = xmlFilename self.namespaces = namespaces self.offset = offset @@ -195,7 +194,7 @@ self.api_until = until self.api_number = number - def get_redirects_from_dump(self, alsoGetPageTitles = False): + def get_redirects_from_dump(self, alsoGetPageTitles=False): ''' Load a local XML dump file, look at all pages which have the redirect flag set, and find out where they're pointing at. Return @@ -264,14 +263,15 @@ else: return redict - def get_redirect_pageids_via_api(self, number = u'max', namespaces = [], start = None, until = None ): + def get_redirect_pageids_via_api(self, number=u'max', namespaces=[], + start=None, until=None): """ Generator which will yield page IDs of Pages that are redirects. Get number of page ids in one go. Iterates over namespaces, Main if an empty list. - In each namespace, start alphabetically from a pagetitle start, wich need not exist. + In each namespace, start alphabetically from a pagetitle start, + which need not exist. """ - # wikipedia.output(u'====> get_redirect_pageids_via_api(number=%s, #ns=%d, start=%s, until=%s)' % (number, len(namespaces), start, until)) if namespaces == []: namespaces = [ 0 ] params = { @@ -282,7 +282,6 @@ 'apdir':'ascending', #'':'', } - for ns in namespaces: # print (ns) params['apnamespace'] = ns @@ -290,32 +289,31 @@ while True: if start: params['apfrom'] = start - # print (apiQ) data = query.GetData(params, self.site) if "limits" in data: # process aplimit = max params['aplimit'] = int(data['limits']['allpages']) - # wikipedia.output(u'===RESULT===\n%s\n' % result) + # wikipedia.output(u'===RESULT===\n%s\n' % data) for x in data['query']['allpages']: if until and x['title'] == until: break yield x['pageid'] - + if 'query-continue' in data: params['apfrom'] = data['query-continue']['allpages']['apfrom'] else: break - - def _next_redirects_via_api_commandline(self, number = 'max', namespaces = [], start = None, until = None ): + def _next_redirects_via_api_commandline(self, number='max', namespaces=[], + start=None, until=None ): """ - yields commands to the api for checking a set op page ids. + Return a generator that retrieves pageids from the API 500 at a time + and yields them as a list """ - # wikipedia.output(u'====> _next_redirects_via_api_commandline(apiQi=%s, number=%s, #ns=%d, start=%s, until=%s)' % (apiQi, number, len(namespaces), start, until)) if namespaces == []: namespaces = [ 0 ] - #maxurllen = 1018 # accomodate "GET " + apiQ + CR + LF in 1024 bytes. apiQ = [] - for pageid in self.get_redirect_pageids_via_api(number, namespaces, start, until): + for pageid in self.get_redirect_pageids_via_api(number, namespaces, + start, until): apiQ.append(pageid) if len(apiQ) >= 500: yield apiQ @@ -323,28 +321,32 @@ if apiQ: yield apiQ - def get_redirects_via_api(self, number = u'max', namespaces = [], start = None, until = None, maxlen = 8 ): + def get_redirects_via_api(self, number=u'max', namespaces=[], start=None, + until=None, maxlen=8): """ - Generator which will yield a tuple of data about Pages that are redirects: + Return a generator that yields tuples of data about redirect Pages: 0 - page title of a redirect page 1 - type of redirect: 0 - broken redirect, target page title missing - 1 - normal redirect, target page exists and is not a redirect + 1 - normal redirect, target page exists and is not a + redirect 2..maxlen - start of a redirect chain of that many redirects - (currently, the API seems not to return sufficient data - to make these return values possible, but that may change) + (currently, the API seems not to return sufficient + data to make these return values possible, but + that may change) maxlen+1 - start of an even longer chain, or a loop - (currently, the API seems not to return sufficient data - to allow this return vaules, but that may change) + (currently, the API seems not to return sufficient + data to allow this return values, but that may + change) None - start of a redirect chain of unknown length, or loop 2 - target page title of the redirect, or chain (may not exist) 3 - target page of the redirect, or end of chain, or page title where chain or loop detecton was halted, or None if unknown Get number of page ids in one go. Iterates over namespaces, Main if an empty list. - In each namespace, start alphabetically from a pagetitle start, wich need not exist. + In each namespace, start alphabetically from a pagetitle start, which + need not exist. """ - # wikipedia.output(u'====> get_redirects_via_api(number=%s, #ns=%d, start=%s, until=%s, maxlen=%s)' % (number, len(namespaces), start, until, maxlen)) import urllib if namespaces == []: namespaces = [ 0 ] @@ -353,17 +355,16 @@ 'redirects':1, #'':'', } - for apiQ in self._next_redirects_via_api_commandline(number, namespaces, start, until): - # wikipedia.output (u'===apiQ=%s' % apiQ) + for apiQ in self._next_redirects_via_api_commandline( + number, namespaces, start, until): params['pageids'] = apiQ data = query.GetData(params, self.site) - # wikipedia.output(u'===RESULT===\n%s\n' % result) redirects = {} pages = {} - redirects = dict([[x['from'], x['to']] for x in data['query']['redirects']]) - + redirects = dict((x['from'], x['to']) + for x in data['query']['redirects']) + for pagetitle in data['query']['pages'].values(): - # wikipedia.output (u'M: %s' % pagetitle) if 'missing' in pagetitle and 'pageid' not in pagetitle: pages[pagetitle['title']] = False else: @@ -386,15 +387,15 @@ result = None pass yield (redirect, result, target, final) - # wikipedia.output (u'X%d: %s => %s ----> %s' % (result, redirect, target, final)) def retrieve_broken_redirects(self): if self.use_api: count = 0 - for (pagetitle, type, target, final) in self.get_redirects_via_api( - namespaces = self.namespaces, - start = self.api_start, - until = self.api_until, maxlen = 2): + for (pagetitle, type, target, final) \ + in self.get_redirects_via_api( + namespaces=self.namespaces, + start=self.api_start, + until=self.api_until, maxlen=2): if type == 0: yield pagetitle if self.api_number: @@ -431,10 +432,10 @@ def retrieve_double_redirects(self): if self.use_api: count = 0 - for (pagetitle, type, target, final) in self.get_redirects_via_api( - namespaces = self.namespaces, - start = self.api_start, - until = self.api_until, maxlen = 2): + for (pagetitle, type, target, final) \ + in self.get_redirects_via_api( + namespaces=self.namespaces, start=self.api_start, + until=self.api_until, maxlen = 2): if type != 0 and type != 1: yield pagetitle if self.api_number: @@ -474,11 +475,8 @@ wikipedia.output(u'\nChecking redirect %i of %i...' % (num + 1, len(redict))) - # /wiki/ - wiki = re.escape(wikipedia.getSite().nice_get_address('')) - # /w/index.php - index = re.escape(wikipedia.getSite().path()) - move_regex = re.compile(r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') + move_regex = re.compile( + r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') def get_moved_pages_redirects(self): '''generate redirects to recently-moved pages''' @@ -487,9 +485,12 @@ if self.offset <= 0: self.offset = 1 - offsetpattern = re.compile(r"""$<a href="/w/index\.php\?title=Special:Log&offset=(\d+)&limit=500&type=move" title="Special:Log" rel="next">older 500</a>$""") + offsetpattern = re.compile( + r"""$<a href="/w/index\.php\?title=Special:Log&offset=(\d+)""" + r"""&limit=500&type=move" title="Special:Log" rel="next">""" + r"""older 500</a>$""") start = datetime.datetime.utcnow() \ - - datetime.timedelta(0, self.offset*3600) + - datetime.timedelta(0, self.offset*3600) # self.offset hours ago offset_time = start.strftime("%Y%m%d%H%M%S") while True: @@ -519,7 +520,8 @@ # moved_page is now a redirect, so any redirects pointing # to it need to be changed try: - for page in moved_page.getReferences(follow_redirects=True, redirectsOnly=True): + for page in moved_page.getReferences(follow_redirects=True, + redirectsOnly=True): yield page except wikipedia.NoPage: # original title must have been deleted after move @@ -531,9 +533,7 @@ class RedirectRobot: def __init__(self, action, generator, always=False, number=None): - self.site = wikipedia.getSite() - self.action = action self.generator = generator self.always = always @@ -542,7 +542,8 @@ def prompt(self, question): if not self.always: - choice = wikipedia.inputChoice(question, ['Yes', 'No', 'All', 'Quit'], + choice = wikipedia.inputChoice(question, + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'n': return False @@ -565,7 +566,8 @@ redir_page = wikipedia.Page(self.site, redir_name) # Show the title of the page we're working on. # Highlight the title in purple. - wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % redir_page.title()) + wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % redir_page.title()) try: targetPage = redir_page.getRedirectTarget() except wikipedia.IsNotRedirectPage: @@ -576,26 +578,36 @@ try: targetPage.get() except wikipedia.NoPage: - if self.prompt(u'Redirect target %s does not exist. Do you want to delete %s?' - % (targetPage.aslink(), redir_page.aslink())): + if self.prompt( + u'Redirect target %s does not exist. Do you want to delete %s?' + % (targetPage.aslink(), + redir_page.aslink())): try: redir_page.delete(reason, prompt = False) except wikipedia.NoUsername: - if targetPage.site().lang in sd_template and targetPage.site().lang in sd_tagging_sum: - wikipedia.output("No sysop in user-config.py, put page to speedy deletion.") + if targetPage.site().lang in sd_template \ + and targetPage.site().lang in sd_tagging_sum: + wikipedia.output( + u"No sysop in user-config.py, put page to speedy deletion.") content = redir_page.get(get_redirect=True) - content = wikipedia.translate(targetPage.site().lang,sd_template)+"\n"+content - summary = wikipedia.translate(targetPage.site().lang,sd_tagging_sum) + content = wikipedia.translate( + targetPage.site().lang, + sd_template)+"\n"+content + summary = wikipedia.translate( + targetPage.site().lang, + sd_tagging_sum) redir_page.put(content, summary) except wikipedia.IsRedirectPage: wikipedia.output( - u'Redirect target %s is also a redirect! Won\'t delete anything.' % targetPage.aslink()) + u'Redirect target %s is also a redirect! Won\'t delete anything.' + % targetPage.aslink()) else: #we successfully get the target page, meaning that #it exists and is not a redirect: no reason to touch it. wikipedia.output( - u'Redirect target %s does exist! Won\'t delete anything.' % targetPage.aslink()) + u'Redirect target %s does exist! Won\'t delete anything.' + % targetPage.aslink()) wikipedia.output(u'') def fix_double_redirects(self): @@ -608,7 +620,8 @@ redir = wikipedia.Page(self.site, redir_name) # Show the title of the page we're working on. # Highlight the title in purple. - wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % redir.title()) + wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % redir.title()) newRedir = redir redirList = [] # bookkeeping to detect loops while True: @@ -638,7 +651,7 @@ #sometimes this error occures. Invalid Title starting with a '#' except wikipedia.InvalidTitle, err: wikipedia.output(u'Warning: %s' % err) - break + break except wikipedia.NoPage: if len(redirList) == 1: wikipedia.output(u'Skipping: Page %s does not exist.' @@ -662,7 +675,8 @@ u' Links to: %s.' % targetPage.aslink()) if targetPage.site() != self.site: - wikipedia.output(u'Warning: redirect target (%s) is on a different site.' + wikipedia.output( + u'Warning: redirect target (%s) is on a different site.' % (targetPage.aslink())) if self.always: break # skip if automatic @@ -686,8 +700,11 @@ and targetPage.site().lang in sd_tagging_sum: wikipedia.output(u"Tagging redirect for deletion") # Delete the two redirects - content = wikipedia.translate(targetPage.site().lang, sd_template)+"\n"+content - summ = wikipedia.translate(targetPage.site().lang, sd_tagging_sum) + content = wikipedia.translate( + targetPage.site().lang, + sd_template)+"\n"+content + summ = wikipedia.translate(targetPage.site().lang, + sd_tagging_sum) targetPage.put(content, summ) redir.put(content, summ) else: @@ -707,7 +724,8 @@ oldText) if text == oldText: break - summary = wikipedia.translate(self.site, msg_double) % targetPage.aslink() + summary = wikipedia.translate(self.site, msg_double)\ + % targetPage.aslink() wikipedia.showDiff(oldText, text) if self.prompt(u'Do you want to accept the changes?'): try: @@ -715,17 +733,20 @@ except wikipedia.LockedPage: wikipedia.output(u'%s is locked.' % redir.title()) except wikipedia.SpamfilterError, error: - wikipedia.output(u"Saving page [[%s]] prevented by spam filter: %s" - % (redir.title(), error.url)) + wikipedia.output( + u"Saving page [[%s]] prevented by spam filter: %s" + % (redir.title(), error.url)) except wikipedia.PageNotSaved, error: wikipedia.output(u"Saving page [[%s]] failed: %s" - % (redir.title(), error)) + % (redir.title(), error)) except wikipedia.NoUsername: - wikipedia.output(u"Page [[%s]] not saved; sysop privileges required." - % redir.title()) + wikipedia.output( + u"Page [[%s]] not saved; sysop privileges required." + % redir.title()) except wikipedia.Error, error: - wikipedia.output(u"Unexpected error occurred trying to save [[%s]]: %s" - % (redir.title(), error)) + wikipedia.output( + u"Unexpected error occurred trying to save [[%s]]: %s" + % (redir.title(), error)) break def fix_double_or_delete_broken_redirects(self): @@ -733,10 +754,12 @@ # get reason for deletion text delete_reason = wikipedia.translate(self.site, reason_broken) count = 0 - for (redir_name, code, target, final) in self.generator.get_redirects_via_api( - namespaces = self.generator.namespaces, - start = self.generator.api_start, - until = self.generator.api_until, maxlen = 2): + for (redir_name, code, target, final)\ + in self.generator.get_redirects_via_api( + namespaces=self.generator.namespaces, + start=self.generator.api_start, + until=self.generator.api_until, + maxlen = 2): if code == 1: continue elif code == 0: @@ -802,8 +825,9 @@ if ns == '': ## "-namespace:" does NOT yield -namespace:0 further down the road! ns = wikipedia.input( - u'Please enter a namespace by its number: ') -# u'Please enter a namespace by its name or number: ') TODO! at least for some generators. + u'Please enter a namespace by its number: ') +# u'Please enter a namespace by its name or number: ') +# TODO! at least for some generators. if ns == '': ns = '0' try: @@ -826,10 +850,12 @@ else: wikipedia.output(u'Unknown argument: %s' % arg) - if not action or (api and moved_pages) or (xmlFilename and moved_pages) or (api and xmlFilename): + if not action or (api and moved_pages) or (xmlFilename and moved_pages)\ + or (api and xmlFilename): wikipedia.showHelp('redirect') else: - gen = RedirectGenerator(xmlFilename, namespaces, offset, moved_pages, api, start, until, number) + gen = RedirectGenerator(xmlFilename, namespaces, offset, moved_pages, + api, start, until, number) bot = RedirectRobot(action, gen, always, number) bot.run() @@ -838,4 +864,3 @@ main() finally: wikipedia.stopme() -

1 0

SVN: [7785] trunk/pywikipedia/blockpageschecker.py
by xqt＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7785 Author: xqt Date: 2009-12-17 14:20:01 +0000 (Thu, 17 Dec 2009) Log Message: ----------- -help option enabled Modified Paths: -------------- trunk/pywikipedia/blockpageschecker.py Modified: trunk/pywikipedia/blockpageschecker.py =================================================================== --- trunk/pywikipedia/blockpageschecker.py 2009-12-17 12:43:48 UTC (rev 7784) +++ trunk/pywikipedia/blockpageschecker.py 2009-12-17 14:20:01 UTC (rev 7785) @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """ This is a script originally written by Wikihermit and then rewritten by Filnik, -to delete the templates used to warn in the pages that a page is blocked, -when the page isn't blocked at all. Indeed, very often sysops block the pages -for a setted time but then the forget to delete the warning! This script is useful -if you want to delete those useless warning left in these pages. +to delete the templates used to warn in the pages that a page is blocked, when +the page isn't blocked at all. Indeed, very often sysops block the pages for a +setted time but then the forget to delete the warning! This script is useful if +you want to delete those useless warning left in these pages. Parameters: @@ -20,21 +20,25 @@ Argument can also be given as "-page:pagetitle". You can give this parameter multiple times to edit multiple pages. --protectedpages: Check all the blocked pages (useful when you have not categories - or when you have problems with them. (add the namespace after ":" where - you want to check - default checks all protected pages) +-protectedpages: Check all the blocked pages; useful when you have not + categories or when you have problems with them. (add the + namespace after ":" where you want to check - default checks + all protected pages.) -moveprotected: Same as -protectedpages, for moveprotected pages Furthermore, the following command line parameters are supported: --always Doesn't ask every time if the bot should make the change or not, do it always. +-always Doesn't ask every time if the bot should make the change or not, + do it always. --debug When the bot can't delete the template from the page (wrong regex or something like that) - it will ask you if it should open the page on your browser. - (attention: pages included may give false positives..) +-debug When the bot can't delete the template from the page (wrong + regex or something like that) it will ask you if it should open + the page on your browser. + (attention: pages included may give false positives!) --move The bot will check if the page is blocked also for the move option, not only for edit +-move The bot will check if the page is blocked also for the move + option, not only for edit --- Warning! --- You have to edit this script in order to add your preferences @@ -59,7 +63,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = '$Id: blockpageschecker.py,v 1.5 2008/04/24 19.40.00 filnik Exp$' +__version__ = '$Id$' # import re, webbrowser @@ -207,9 +211,6 @@ """ Main Function """ # Loading the comments global categoryToCheck, comment, project_inserted - if config.mylang not in project_inserted: - pywikibot.output(u"Your project is not supported by this script. You have to edit the script and add it!") - return # always, define a generator to understand if the user sets one, defining what's genFactory always = False; generator = False; debug = False moveBlockCheck = False; genFactory = pagegenerators.GeneratorFactory() @@ -242,6 +243,10 @@ else: genFactory.handleArg(arg) + if config.mylang not in project_inserted: + pywikibot.output(u"Your project is not supported by this script.\nYou have to edit the script and add it!") + return + # Load the right site site = pywikibot.getSite()

1 0

SVN: [7784] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7784 Author: xqt Date: 2009-12-17 12:43:48 +0000 (Thu, 17 Dec 2009) Log Message: ----------- handle 504 gateway timeout during getUrl processing Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-17 09:11:31 UTC (rev 7783) +++ trunk/pywikipedia/wikipedia.py 2009-12-17 12:43:48 UTC (rev 7784) @@ -5946,15 +5946,26 @@ except urllib2.HTTPError, e: if e.code in [401, 404]: raise PageNotFound(u'Page %s could not be retrieved. Check your family file ?' % url) - output(u"Result:%s %s" % (e.code, e.msg)) - raise + elif e.code == 504: + output(u'HTTPError: %s %s' % (e.code, e.msg)) + if retry: + output(u"""WARNING: Could not open '%s'.Maybe the server or\n your connection is down. Retrying in %i minutes...""" + % (url, retry_idle_time)) + time.sleep(retry_idle_time * 60) + # Next time wait longer, but not longer than half an hour + if retry_idle_time > 30: + retry_idle_time = 30 + continue + raise + else: + output(u"Result: %s %s" % (e.code, e.msg)) + raise except Exception, e: output(u'%s' %e) if retry: output(u"""WARNING: Could not open '%s'. Maybe the server or\n your connection is down. Retrying in %i minutes...""" % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) - # Next time wait longer, but not longer than half an hour retry_idle_time *= 2 if retry_idle_time > 30: retry_idle_time = 30

1 0

SVN: [7783] trunk/pywikipedia/interwiki.py
by xqt＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7783 Author: xqt Date: 2009-12-17 09:11:31 +0000 (Thu, 17 Dec 2009) Log Message: ----------- always-option: don't ask for the rest of (only) one subject Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-12-17 07:50:12 UTC (rev 7782) +++ trunk/pywikipedia/interwiki.py 2009-12-17 09:11:31 UTC (rev 7783) @@ -536,6 +536,7 @@ """ autonomous = False confirm = False + always = False select = False debug = True followredirect = True @@ -1538,6 +1539,7 @@ updatedSites = [] notUpdatedSites = [] # Process all languages here + globalvar.always = False if globalvar.limittwo: lclSite = self.originPage.site() lclSiteDone = False @@ -1723,7 +1725,7 @@ ask = True if globalvar.force: ask = False - if globalvar.confirm: + if globalvar.confirm and not globalvar.always: ask = True # If we need to ask, do so if ask: @@ -1732,8 +1734,8 @@ answer = 'n' else: answer = pywikibot.inputChoice(u'Submit?', - ['Yes', 'No', 'open in Browser', 'Give up'], - ['y', 'n', 'b', 'g']) + ['Yes', 'No', 'open in Browser', 'Give up', 'Always'], + ['y', 'n', 'b', 'g', 'a']) if answer == 'b': webbrowser.open("http://%s%s" % ( page.site().hostname(), @@ -1741,6 +1743,10 @@ )) pywikibot.input("Press Enter when finished in browser.") return True + elif answer == 'a': + # don't ask for the rest of this subject + globalvar.always = True + answer = 'y' else: # If we do not need to ask, allow answer = 'y'

1 0

SVN: [7782] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 17 Dec '09

17 Dec '09

Revision: 7782 Author: xqt Date: 2009-12-17 07:50:12 +0000 (Thu, 17 Dec 2009) Log Message: ----------- handle 504 gateway timeout during postData processing Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-12-16 21:46:01 UTC (rev 7781) +++ trunk/pywikipedia/wikipedia.py 2009-12-17 07:50:12 UTC (rev 7782) @@ -5803,7 +5803,7 @@ if e.code in [401, 404]: raise PageNotFound(u'Page %s could not be retrieved. Check your family file ?' % url) # just check for HTTP Status 500 (Internal Server Error)? - elif e.code == 500: + elif e.code in [500, 504]: output(u'HTTPError: %s %s' % (e.code, e.msg)) if config.retry_on_fail: output(u"""WARNING: Could not open '%s'.\nMaybe the server is down. Retrying in %i minutes..."""

1 0

SVN: [7781] trunk/pywikipedia/imagecopy.py
by multichill＠svn.wikimedia.org 16 Dec '09

16 Dec '09

Revision: 7781 Author: multichill Date: 2009-12-16 21:46:01 +0000 (Wed, 16 Dec 2009) Log Message: ----------- *Fixed always option *Hacked in category option Modified Paths: -------------- trunk/pywikipedia/imagecopy.py Modified: trunk/pywikipedia/imagecopy.py =================================================================== --- trunk/pywikipedia/imagecopy.py 2009-12-16 21:12:25 UTC (rev 7780) +++ trunk/pywikipedia/imagecopy.py 2009-12-16 21:46:01 UTC (rev 7781) @@ -245,9 +245,10 @@ class imageTransfer (threading.Thread): - def __init__ ( self, imagePage, newname): + def __init__ ( self, imagePage, newname, category): self.imagePage = imagePage self.newname = newname + self.category = category threading.Thread.__init__ ( self ) def run(self): @@ -275,6 +276,11 @@ # I want every picture to be tagged with the bottemplate so i can check my contributions later. CH=u'\n\n{{BotMoveToCommons|'+ self.imagePage.site().language() + '.' + self.imagePage.site().family.name +'|year={{subst:CURRENTYEAR}}|month={{subst:CURRENTMONTHNAME}}|day={{subst:CURRENTDAY}}}}' + CH + + if self.category: + CH = CH.replace(u'{{subst:Unc}} ', u'') + CH = CH + u'[[Category:' + self.category + u']]' + bot = UploadRobot(url=self.imagePage.fileUrl(), description=CH, useFilename=self.newname, keepFilename=True, verifyDescription=False, ignoreWarning = True, targetSite = wikipedia.getSite('commons', 'commons')) bot.run() @@ -462,12 +468,16 @@ generator = None; #newname = ""; imagepage = None; + always = False + category = u'' # Load a lot of default generators genFactory = pagegenerators.GeneratorFactory() for arg in wikipedia.handleArgs(): if arg == '-always': always = True + elif arg.startswith('-cc:'): + category = arg [len('-cc:'):] else: genFactory.handleArg(arg) @@ -526,7 +536,7 @@ # We dont overwrite images, pick another name, go to the start of the loop if not skip: - imageTransfer(imagepage, newname).start() + imageTransfer(imagepage, newname, category).start() wikipedia.output(u'Still ' + str(threading.activeCount()) + u' active threads, lets wait') for openthread in threading.enumerate():

1 0

SVN: [7780] trunk/pywikipedia/imagecopy.py
by multichill＠svn.wikimedia.org 16 Dec '09

16 Dec '09

Revision: 7780 Author: multichill Date: 2009-12-16 21:12:25 +0000 (Wed, 16 Dec 2009) Log Message: ----------- Added -always option. Won't prompt the user. Use with care! Modified Paths: -------------- trunk/pywikipedia/imagecopy.py Modified: trunk/pywikipedia/imagecopy.py =================================================================== --- trunk/pywikipedia/imagecopy.py 2009-12-15 17:33:40 UTC (rev 7779) +++ trunk/pywikipedia/imagecopy.py 2009-12-16 21:12:25 UTC (rev 7780) @@ -478,6 +478,7 @@ pregenerator = pagegenerators.PreloadingGenerator(generator) for page in pregenerator: + skip = False if page.exists() and (page.namespace() == 6) and (not page.isRedirectPage()) : imagepage = wikipedia.ImagePage(page.site(), page.title()) @@ -492,31 +493,37 @@ except NotImplementedError: #No API, using the page file instead (datetime, username, resolution, size, comment) = imagepage.getFileVersionHistory().pop() - while True: + if always: + newname=imagepage.titleWithoutNamespace() + CommonsPage=wikipedia.Page(wikipedia.getSite('commons', 'commons'), u'File:'+newname) + if CommonsPage.exists(): + skip = True + else: + while True: + + # Do the Tkdialog to accept/reject and change te name + (newname, skip)=Tkdialog(imagepage.titleWithoutNamespace(), imagepage.get(), username, imagepage.permalink(), imagepage.templates()).getnewname() - # Do the Tkdialog to accept/reject and change te name - (newname, skip)=Tkdialog(imagepage.titleWithoutNamespace(), imagepage.get(), username, imagepage.permalink(), imagepage.templates()).getnewname() + if skip: + wikipedia.output('Skipping this image') + break - if skip: - wikipedia.output('Skipping this image') - break - - # Did we enter a new name? - if len(newname)==0: - #Take the old name - newname=imagepage.titleWithoutNamespace() - else: - newname = newname.decode('utf-8') + # Did we enter a new name? + if len(newname)==0: + #Take the old name + newname=imagepage.titleWithoutNamespace() + else: + newname = newname.decode('utf-8') - # Check if the image already exists - CommonsPage=wikipedia.Page( - wikipedia.getSite('commons', 'commons'), - 'Image:'+newname) - if not CommonsPage.exists(): - break - else: - wikipedia.output('Image already exists, pick another name or skip this image') - # We dont overwrite images, pick another name, go to the start of the loop + # Check if the image already exists + CommonsPage=wikipedia.Page( + wikipedia.getSite('commons', 'commons'), + u'File:'+newname) + if not CommonsPage.exists(): + break + else: + wikipedia.output('Image already exists, pick another name or skip this image') + # We dont overwrite images, pick another name, go to the start of the loop if not skip: imageTransfer(imagepage, newname).start()

1 0

SVN: [7779] trunk/pywikipedia/fixes.py
by xqt＠svn.wikimedia.org 15 Dec '09

15 Dec '09

Revision: 7779 Author: xqt Date: 2009-12-15 17:33:40 +0000 (Tue, 15 Dec 2009) Log Message: ----------- docu max 80 chars Modified Paths: -------------- trunk/pywikipedia/fixes.py Modified: trunk/pywikipedia/fixes.py =================================================================== --- trunk/pywikipedia/fixes.py 2009-12-15 15:23:30 UTC (rev 7778) +++ trunk/pywikipedia/fixes.py 2009-12-15 17:33:40 UTC (rev 7779) @@ -13,23 +13,34 @@ # help = u""" - * HTML - Convert HTML tags to wiki syntax, and - fix XHTML. - * isbn - Fix badly formatted ISBNs. - * syntax - Try to fix bad wiki markup. Do not run - this in automatic mode, as the bot may - make mistakes. - * syntax-safe - Like syntax, but less risky, so you can - run this in automatic mode. - * case-de - fix upper/lower case errors in German - * grammar-de - fix grammar and typography in German - * vonbis - Ersetze Binde-/Gedankenstrich durch "bis" in German - * music - Links auf Begriffsklärungen in German - * datum - specific date formats in German - * correct-ar - Corrections for Arabic Wikipedia and any Arabic wiki. - * yu-tld - the yu top-level domain will soon be disabled, see - * fckeditor - Try to convert FCKeditor HTML tags to wiki syntax. - http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html + * HTML - Convert HTML tags to wiki syntax, and + fix XHTML. + **) NOTE below + * isbn - Fix badly formatted ISBNs. + **) NOTE below + * syntax - Try to fix bad wiki markup. Do not run + this in automatic mode, as the bot may + make mistakes. + * syntax-safe - Like syntax, but less risky, so you can + run this in automatic mode. + **) NOTE below + * case-de - fix upper/lower case errors in German + * grammar-de - fix grammar and typography in German + * vonbis - Ersetze Binde-/Gedankenstrich durch "bis" + in German + * music - Links auf Begriffsklärungen in German + * datum - specific date formats in German + * correct-ar - Corrections for Arabic Wikipedia and any + Arabic wiki. + * yu-tld - the yu top-level domain will soon be + disabled, see + * fckeditor - Try to convert FCKeditor HTML tags to wiki + syntax. + http://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html + + **) NOTE: these fixes are part of the + cosmetic_changes.py. You may use + that script instead. """

1 0

SVN: [7778] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 15 Dec '09

15 Dec '09

Revision: 7778 Author: russblau Date: 2009-12-15 15:23:30 +0000 (Tue, 15 Dec 2009) Log Message: ----------- Update family files from trunk Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiversity_family.py branches/rewrite/pywikibot/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-7685 + /trunk/pywikipedia/families:5896-6197,6212-7777 Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2009-12-15 15:19:33 UTC (rev 7777) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2009-12-15 15:23:30 UTC (rev 7778) @@ -156,7 +156,7 @@ 'cu': [u'Мъногосъмыслиѥ', u'Disambig'], 'cy': [u'Anamrwysedd', u'Disambig', u'Gwahaniaethu'], 'da': [u'Flertydig'], - 'de': [u'Begriffsklärung', u'BKS', u'Disambig'], + 'de': [u'Begriffsklärung'], 'dsb': [u'Wěcejwóznamowosć'], 'el': [u'Disambig', u'Αποσαφ', u'Αποσαφήνιση'], 'en': None, @@ -220,6 +220,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'], @@ -480,6 +481,7 @@ 'pt': [102], 'als': [104], 'ar': [104], + 'de': [4], 'en': [12], 'es': [104], 'fi': [4], @@ -502,11 +504,33 @@ }, } self.crossnamespace[4] = { - 'fi': {'_default': [0]} + '_default': { + '_default': [12], + }, + 'de': { + '_default': [0, 12] + }, + 'fi': { + '_default': [0, 12] + }, } self.crossnamespace[5] = { - 'fi': {'_default': [1]} + 'fi': { + '_default': [1]} } + self.crossnamespace[12] = { + '_default': { + '_default': [4], + }, + 'en': { + '_default': [0, 4], + }, + } + self.crossnamespace[13] = { + 'en': { + '_default': [0], + }, + } self.crossnamespace[102] = { 'pt': { '_default': [0], @@ -519,6 +543,7 @@ 'hr': { '_default': [0], 'als': [0, 104], + 'ar': [0, 104], 'es': [0, 104], 'fr': [0, 104], 'lt': [0, 104] @@ -548,6 +573,7 @@ }, 'ar': { '_default': [0, 100], + 'hr': [0, 102], 'pt': [0, 102], }, 'es': { @@ -591,16 +617,7 @@ 'hr': [0, 103], }, } - self.crossnamespace[12] = { - 'en': { - '_default': [0], - }, - } - self.crossnamespace[13] = { - 'en': { - '_default': [0], - }, - } + def get_known_families(self, site): # In Swedish Wikipedia 's:' is part of page title not a family # prefix for 'wikisource'. Modified: branches/rewrite/pywikibot/families/wikiversity_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiversity_family.py 2009-12-15 15:19:33 UTC (rev 7777) +++ branches/rewrite/pywikibot/families/wikiversity_family.py 2009-12-15 15:23:30 UTC (rev 7778) @@ -12,7 +12,7 @@ self.languages_by_size = [ 'en', 'fr', 'de', 'beta', 'cs', 'es', 'it', 'pt', 'el', 'fi', - 'ja', + 'ja', 'ru', ] for lang in self.languages_by_size: Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2009-12-15 15:19:33 UTC (rev 7777) +++ branches/rewrite/pywikibot/family.py 2009-12-15 15:23:30 UTC (rev 7778) @@ -768,7 +768,7 @@ u'\u1794\u17d2\u178a\u17bc\u179a\u1785\u17c6\u178e\u1784\u1787\u17be\u1784', u'ប្តូរទីតាំងទៅ'], 'ko': [u'넘겨주기'], - 'ksh': [u'ömleidung'], + 'ksh': [u'ömleide op', u'ömleidung'], 'kv': [u'перенаправление', u'перенапр'], 'lad': [u'redirección'], 'lb': [u'weiterleitung'], Property changes on: branches/rewrite/pywikibot/family.py ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/pywikipedia/family.py:6057-7685 + /trunk/pywikipedia/family.py:6057-7776

1 0

SVN: [7777] branches/rewrite/pywikibot/textlib.py
by russblau＠svn.wikimedia.org 15 Dec '09

15 Dec '09

Revision: 7777 Author: russblau Date: 2009-12-15 15:19:33 +0000 (Tue, 15 Dec 2009) Log Message: ----------- strip whitespace from template parameter names and values Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-12-15 11:30:01 UTC (rev 7776) +++ branches/rewrite/pywikibot/textlib.py 2009-12-15 15:19:33 UTC (rev 7777) @@ -347,14 +347,14 @@ return removeLanguageLinks(text, site, marker) -def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, +def replaceLanguageLinks(oldtext, new, site = None, addOnly = False, template = False): """Replace interlanguage links in the text with a new set of links. - 'new' should be a dict with the Site objects as keys, and Page or Link + 'new' should be a dict with the Site objects as keys, and Page or Link objects as values (i.e., just like the dict returned by getLanguageLinks function). - + """ # Find a marker that is not already in the text. marker = findmarker( oldtext, u'@@') @@ -581,7 +581,7 @@ If addOnly is True, the old category won't be deleted andthe category(s) given will be added (and so they won't replace anything). - + """ # Find a marker that is not already in the text. marker = findmarker( oldtext, u'@@') @@ -641,7 +641,7 @@ 'categories' should be a list of Category objects. The string is formatted for inclusion in insite. - + """ if not categories: return '' @@ -790,7 +790,7 @@ for m2 in Rmarker3.finditer(param_val): param_val = param_val.replace(m2.group(), maths[int(m2.group(1))]) - params[param_name] = param_val + params[param_name.strip()] = param_val.strip() # Add it to the result result.append((name, params))

1 0

SVN: [7776] trunk/pywikipedia/add_text.py
by xqt＠svn.wikimedia.org 15 Dec '09

15 Dec '09

Revision: 7776 Author: xqt Date: 2009-12-15 11:30:01 +0000 (Tue, 15 Dec 2009) Log Message: ----------- obsolete list removed; use max 80 chars for help output Modified Paths: -------------- trunk/pywikipedia/add_text.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2009-12-14 15:42:09 UTC (rev 7775) +++ trunk/pywikipedia/add_text.py 2009-12-15 11:30:01 UTC (rev 7776) @@ -1,8 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """ -This is a Bot written by Filnik to add a text at the end of the page but above categories, -interwiki and template for the stars of the interwiki (default). +This is a Bot written by Filnik to add a text at the end of the page but above +categories, interwiki and template for the stars of the interwiki (default). Alternatively it may also add a text at the top of the page. These command line parameters can be used to specify which pages to work on: @@ -11,27 +11,43 @@ Furthermore, the following command line parameters are supported: --page Use a page as generator --text Define which text to add. "\n" are interpreted as newlines. --summary Define the summary to use --except Use a regex to check if the text is already in the page --excepturl Use the html page as text where you want to see if there's the text, not the wiki-page. --newimages Add text in the new images --untagged Add text in the images that don't have any license template --always If used, the bot won't ask if it should add the text specified --up If used, put the text at the top of the page +-page Use a page as generator +-text Define which text to add. "\n" are interpreted as newlines. + +-summary Define the summary to use + +-except Use a regex to check if the text is already in the page + +-excepturl Use the html page as text where you want to see if there's + the text, not the wiki-page. + +-newimages Add text in the new images + +-untagged Add text in the images that don't have any license template + +-always If used, the bot won't ask if it should add the text + specified + +-up If used, put the text at the top of the page + --- Example --- 1. -# This is a script to add a template to the top of the pages with category:catname -python add_text.py -cat:catname -summary:"Bot: Adding a template" -text:"{{Something}}" -except:"\{\{([Tt]emplate:|)[Ss]omething" -up +# This is a script to add a template to the top of the pages with +# category:catname +# Warning! Put it in one line, otherwise it won't work correctly. +python add_text.py -cat:catname -summary:"Bot: Adding a template" +-text:"{{Something}}" -except:"\{\{([Tt]emplate:|)[Ss]omething" -up + 2. -# Command used on it.wikipedia to put the template in the page without any category. -# But warning! Put it in a line, otherwise it won't work correctly. +# Command used on it.wikipedia to put the template in the page without any +# category. +# Warning! Put it in one line, otherwise it won't work correctly. -python add_text.py -excepturl:"class='catlinks'>" -uncat -text:"{{Categorizzare}}" --except:"\{\{([Tt]emplate:|)[Cc]ategorizzare" -summary:"Bot: Aggiungo template Categorizzare" +python add_text.py -excepturl:"class='catlinks'>" -uncat +-text:"{{Categorizzare}}" -except:"\{\{([Tt]emplate:|)[Cc]ategorizzare" +-summary:"Bot: Aggiungo template Categorizzare" --- Credits and Help --- This script has been written by Botwiki's staff, if you want to help us @@ -191,7 +207,6 @@ if (site.language()==u'nn'): newtext = newtext + u'\n' + nn_iw_msg # Dealing the stars' issue - starsListInPage = list() for star in starsList: regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}\n)' % star, re.I) risultato = regex.findall(newtext)

1 0

SVN: [7775] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 14 Dec '09

14 Dec '09

Revision: 7775 Author: xqt Date: 2009-12-14 15:42:09 +0000 (Mon, 14 Dec 2009) Log Message: ----------- new namespace for ko-wiki (bugzilla 20863) Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2009-12-14 14:00:56 UTC (rev 7774) +++ trunk/pywikipedia/families/wikipedia_family.py 2009-12-14 15:42:09 UTC (rev 7775) @@ -373,6 +373,7 @@ 'ja': u'Portal', 'ka': u'პორტალი', 'kk': u'Портал', + 'ko': u'들머리', 'la': u'Porta', 'li': u'Portaol', 'lmo': u'Portal', @@ -456,6 +457,7 @@ 'ja': u'Portal‐ノート', 'ka': u'პორტალი განხილვა', 'kk': u'Портал талқылауы', + 'ko': u'들머리토론', 'la': u'Disputatio Portae', 'li': u'Euverlèk portaol', 'lmo': u'Descüssiú Portal',

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn December 2009