Pywikipedia-svn April 2010

pywikipedia-svn@lists.wikimedia.org

8 participants
96 discussions

SVN: [8140] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 29 Apr '10

29 Apr '10

Revision: 8140 Author: xqt Date: 2010-04-29 13:57:22 +0000 (Thu, 29 Apr 2010) Log Message: ----------- update cs-wiki and eo-wiki namespace alias, update language_by_size Modified Paths: -------------- branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wiktionary_family.py branches/rewrite/pywikibot/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/wiktionary_family.py trunk/pywikipedia/family.py Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'th', - 'tr', 'mk', 'sr', 'fa', 'tl', 'ar', 'id', 'is', 'gl', 'no', 'ta', + 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'gl', 'is', 'no', 'ta', 'ko', 'ka', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -18,7 +18,7 @@ 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'war', 'la', 'ka', 'br', 'az', 'sh', 'lb', 'bs', 'is', 'mr', 'jv', 'cy', 'lv', 'tl', 'sq', 'pms', 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', + 'fy', 'scn', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'lmo', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'ga', 'tg', 'hy', 'roa-tara', 'vec', 'kn', 'gd', 'yo', 'yi', 'uz', 'pam', 'os', 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'tt', 'nah', 'li', 'glk', @@ -35,7 +35,7 @@ 'mwl', 'kaa', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'ee', 'bug', 'chr', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', - 'dz', 'ch', 'cr', 'sg', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', + 'dz', 'ch', 'sg', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', 'rw', 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -12,8 +12,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', 'eo', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', + 'tr', 'fr', 'he', 'cs', 'lt', 'zh', 'el', 'hu', 'fa', 'uk', 'eo', + 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', 'ka', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'eu', 'sq', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -17,14 +17,14 @@ 'uk', 'ca', 'vo', 'li', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', 'simple', 'sw', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'ne', 'tk', 'ast', 'ur', - 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'my', - 'gn', 'az', 'co', 'ia', 'mg', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', - 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'sh', 'an', - 'bn', 'gu', 'be', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', - 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'gd', 'kw', - 'tg', 'si', 'nn', 'gv', 'zu', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', - 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'ka', 'hi', 'my', 'co', + 'ga', 'gn', 'az', 'ia', 'mg', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', + 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'be', 'ps', 'an', + 'sh', 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', + 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'gv', 'gd', + 'kw', 'tg', 'si', 'nn', 'zu', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', + 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'lb', 'jbo', + 'tn', 'sm', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] for lang in self.languages_by_size: Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ branches/rewrite/pywikibot/family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -21,7 +21,8 @@ class Family: def __init__(self): self.name = None - # Updated from http://meta.wikimedia.org/wiki/Interwiki_sorting_order + + # Updated from http://meta.wikimedia.org/wiki/Interwiki_sorting_order self.alphabetic = [ 'ace', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm', 'bn', Modified: trunk/pywikipedia/families/wikibooks_family.py =================================================================== --- trunk/pywikipedia/families/wikibooks_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/families/wikibooks_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -13,7 +13,7 @@ self.languages_by_size = [ 'en', 'de', 'fr', 'ja', 'pt', 'hu', 'es', 'nl', 'pl', 'it', 'he', 'sq', 'fi', 'vi', 'ru', 'cs', 'hr', 'ca', 'zh', 'sv', 'da', 'th', - 'tr', 'mk', 'sr', 'fa', 'tl', 'ar', 'id', 'is', 'gl', 'no', 'ta', + 'tr', 'mk', 'sr', 'tl', 'fa', 'ar', 'id', 'gl', 'is', 'no', 'ta', 'ko', 'ka', 'eo', 'lt', 'bg', 'ro', 'sk', 'el', 'la', 'si', 'ia', 'ang', 'cv', 'sl', 'et', 'mr', 'uk', 'ur', 'ml', 'az', 'oc', 'ms', 'eu', 'hi', 'fy', 'ie', 'tg', 'bn', 'hy', 'af', 'pa', 'te', 'bs', Modified: trunk/pywikipedia/families/wikinews_family.py =================================================================== --- trunk/pywikipedia/families/wikinews_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/families/wikinews_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -24,7 +24,7 @@ # Override defaults self.namespaces[2]['cs'] = u'Redaktor' self.namespaces[2]['pl'] = u'Wikireporter' - self.namespaces[3]['cs'] = u'Redaktor diskuse' + self.namespaces[3]['cs'] = u'Diskuse s redaktorem' self.namespaces[3]['pl'] = u'Dyskusja Wikireportera' Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -18,7 +18,7 @@ 'hi', 'ht', 'el', 'te', 'ceb', 'mk', 'war', 'la', 'ka', 'br', 'az', 'sh', 'lb', 'bs', 'is', 'mr', 'jv', 'cy', 'lv', 'tl', 'sq', 'pms', 'bpy', 'be-x-old', 'ta', 'bn', 'oc', 'an', 'be', 'io', 'sw', 'nds', - 'scn', 'fy', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', + 'fy', 'scn', 'qu', 'af', 'su', 'gu', 'zh-yue', 'ast', 'ur', 'nap', 'ku', 'lmo', 'bat-smg', 'ml', 'wa', 'cv', 'ksh', 'ga', 'tg', 'hy', 'roa-tara', 'vec', 'kn', 'gd', 'yo', 'yi', 'uz', 'pam', 'os', 'zh-min-nan', 'mi', 'kk', 'sah', 'als', 'tt', 'nah', 'li', 'glk', @@ -35,7 +35,7 @@ 'mwl', 'kaa', 'ce', 'sm', 'av', 'ks', 'tet', 'got', 'sd', 'pcd', 'mdf', 'na', 'bm', 'pnt', 'iu', 'pih', 'as', 'cdo', 'ee', 'bug', 'chr', 'om', 'zu', 'fj', 'ti', 'za', 'ts', 'ss', 've', 'bi', 'ha', - 'dz', 'ch', 'cr', 'sg', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', + 'dz', 'ch', 'sg', 'cr', 'xh', 'ak', 'lbe', 'tn', 'ki', 'ik', 'bxr', 'rw', 'st', 'tw', 'ny', 'sn', 'chy', 'ff', 'lg', 'tum', 'rn', ] @@ -46,6 +46,7 @@ # Override defaults self.namespaces[2]['cs'] = u'Wikipedista' + self.namespaces[3]['cs'] = u'Diskuse s wikipedistou' self.namespaces[2]['pl'] = u'Wikipedysta' self.namespaces[3]['pl'] = u'Dyskusja wikipedysty' Modified: trunk/pywikipedia/families/wikiquote_family.py =================================================================== --- trunk/pywikipedia/families/wikiquote_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/families/wikiquote_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -12,8 +12,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', 'eo', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', + 'tr', 'fr', 'he', 'cs', 'lt', 'zh', 'el', 'hu', 'fa', 'uk', 'eo', + 'id', 'sv', 'nl', 'no', 'ja', 'fi', 'hy', 'nn', 'et', 'ca', 'ar', 'ka', 'ko', 'ku', 'hr', 'gl', 'sr', 'ro', 'cy', 'ml', 'li', 'is', 'th', 'te', 'af', 'da', 'az', 'eu', 'sq', 'vi', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ta', 'ang', 'mr', 'zh-min-nan', 'gu', 'lb', Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -17,14 +17,14 @@ 'uk', 'ca', 'vo', 'li', 'fa', 'is', 'scn', 'sr', 'af', 'cs', 'th', 'simple', 'sw', 'fy', 'oc', 'br', 'he', 'hr', 'sl', 'hy', 'sq', 'tt', 'la', 'zh-min-nan', 'da', 'wa', 'ne', 'tk', 'ast', 'ur', - 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'hi', 'ka', 'ga', 'my', - 'gn', 'az', 'co', 'ia', 'mg', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', - 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'ps', 'sh', 'an', - 'bn', 'gu', 'be', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', - 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'gd', 'kw', - 'tg', 'si', 'nn', 'gv', 'zu', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', - 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'jbo', 'tn', - 'sm', 'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als', + 'hsb', 'kk', 'ky', 'eo', 'lv', 'wo', 'ang', 'ka', 'hi', 'my', 'co', + 'ga', 'gn', 'az', 'ia', 'mg', 'eu', 'sk', 'csb', 'ms', 'st', 'tl', + 'mr', 'cy', 'nds', 'kl', 'sd', 'ug', 'ti', 'mk', 'be', 'ps', 'an', + 'sh', 'bn', 'gu', 'km', 'ss', 'ts', 'qu', 'bs', 'fo', 'am', 'rw', + 'chr', 'su', 'om', 'mn', 'nah', 'ie', 'yi', 'iu', 'mt', 'gv', 'gd', + 'kw', 'tg', 'si', 'nn', 'zu', 'dv', 'pa', 'tpi', 'sg', 'roa-rup', + 'uz', 'mi', 'jv', 'ik', 'so', 'ha', 'ay', 'sa', 'na', 'lb', 'jbo', + 'tn', 'sm', 'ks', 'fj', 'ln', 'za', 'dz', 'als', ] if family.config.SSL_connection: @@ -33,6 +33,8 @@ self.langs = dict([(lang, '%s.wiktionary.org' % lang) for lang in self.languages_by_size]) # Override defaults + self.namespaces[2]['eo'] = u'Uzanto' + self.namespaces[3]['eo'] = u'Uzanta diskuto' self.namespaces[2]['pl'] = u'Wikipedysta' self.namespaces[3]['pl'] = u'Dyskusja Wikipedysty' Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2010-04-29 05:53:37 UTC (rev 8139) +++ trunk/pywikipedia/family.py 2010-04-29 13:57:22 UTC (rev 8140) @@ -782,7 +782,7 @@ 'ch': u'Kombetsasion ni muna\'sesetbi', 'ckb': u'لێدوانی بەکارھێنەر', 'crh': [u'Qullanıcı muzakeresi', u'Къулланыджы музакереси'], - 'cs': u'Diskuse s wikipedistou', + 'cs': u'Diskuse s uživatelem', 'csb': u'Diskùsëjô brëkòwnika', 'cu': u'По́льꙃєватєлꙗ бєсѣ́да', 'cv': u'Хутшăнаканăн канашлу страници',

1 0

SVN: [8139] trunk/pywikipedia/xmlreader.py
by xqt＠svn.wikimedia.org 29 Apr '10

29 Apr '10

Revision: 8139 Author: xqt Date: 2010-04-29 05:53:37 +0000 (Thu, 29 Apr 2010) Log Message: ----------- memory leak fix + small optimization by Dmitry. Thanks. Modified Paths: -------------- trunk/pywikipedia/xmlreader.py Modified: trunk/pywikipedia/xmlreader.py =================================================================== --- trunk/pywikipedia/xmlreader.py 2010-04-29 05:21:09 UTC (rev 8138) +++ trunk/pywikipedia/xmlreader.py 2010-04-29 05:53:37 UTC (rev 8139) @@ -62,7 +62,9 @@ """ Represents a page. """ - def __init__(self, title, id, text, username, ipedit, timestamp, editRestriction, moveRestriction, revisionid, comment, redirect): + def __init__(self, title, id, text, username, ipedit, timestamp, + editRestriction, moveRestriction, revisionid, comment, + redirect): # TODO: there are more tags we can read. self.title = title self.id = id @@ -172,7 +174,8 @@ if name == 'contributor': self.inContributorTag = False elif name == 'restrictions': - self.editRestriction, self.moveRestriction = parseRestrictions(self.restrictions) + self.editRestriction, self.moveRestriction \ + = parseRestrictions(self.restrictions) elif name == 'redirect': self.isredirect = True elif name == 'revision': @@ -318,18 +321,18 @@ """Parser that yields only the latest revision""" if event == "end" and elem.tag == "{%s}page" % self.uri: self._headers(elem) - revision = elem.find("{%s}revision" % self.uri) yield self._create_revision(revision) + elem.clear() self.root.clear() def _parse_all(self, event, elem): """Parser that yields all revisions""" if event == "start" and elem.tag == "{%s}page" % self.uri: self._headers(elem) - if event == "end" and elem.tag == "{%s}revision" % self.uri: yield self._create_revision(elem) + elem.clear() self.root.clear() def _headers(self, elem): @@ -337,7 +340,10 @@ self.pageid = elem.findtext("{%s}id" % self.uri) self.restrictions = elem.findtext("{%s}restrictions" % self.uri) self.isredirect = elem.findtext("{%s}redirect" % self.uri) is not None + self.editRestriction, self.moveRestriction \ + = parseRestrictions(self.restrictions) + def _create_revision(self, revision): """Creates a Single revision""" revisionid = revision.findtext("{%s}id" % self.uri) @@ -348,16 +354,14 @@ username = ipeditor or contributor.findtext("{%s}username" % self.uri) # could get comment, minor as well text = revision.findtext("{%s}text" % self.uri) - editRestriction, moveRestriction \ - = parseRestrictions(self.restrictions) return XmlEntry(title=self.title, id=self.pageid, text=text or u'', username=username or u'', #username might be deleted ipedit=bool(ipeditor), timestamp=timestamp, - editRestriction=editRestriction, - moveRestriction=moveRestriction, + editRestriction=self.editRestriction, + moveRestriction=self.moveRestriction, revisionid=revisionid, comment=comment, redirect=self.isredirect @@ -414,7 +418,8 @@ lines = u'' text = m.group('text') or u'' restrictions = m.group('restrictions') - editRestriction, moveRestriction = parseRestrictions(restrictions) + editRestriction, moveRestriction \ + = parseRestrictions(restrictions) if m.group('username'): username = m.group('username')

1 0

SVN: [8138] branches/rewrite/pywikibot/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 29 Apr '10

29 Apr '10

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

1 0

SVN: [8137] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 29 Apr '10

29 Apr '10

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

1 0

SVN: [8136] trunk/pywikipedia/wikipedia.py
by shizhao＠svn.wikimedia.org 28 Apr '10

28 Apr '10

Revision: 8136 Author: shizhao Date: 2010-04-28 20:29:31 +0000 (Wed, 28 Apr 2010) Log Message: ----------- categories() new add API query. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-04-28 14:33:06 UTC (rev 8135) +++ trunk/pywikipedia/wikipedia.py 2010-04-28 20:29:31 UTC (rev 8136) @@ -2173,12 +2173,50 @@ category links in the page text. """ - try: - category_links_to_return = getCategoryLinks(self.get(get_redirect=get_redirect), self.site()) - except NoPage: - category_links_to_return = [] - return category_links_to_return +# New add API query. +# api.php?action=query&prop=categories&titles=Albert%20Einstein + +# + if not self.site().has_api(): + try: + category_links_to_return = getCategoryLinks(self.get(get_redirect=get_redirect), self.site()) + except NoPage: + category_links_to_return = [] + return category_links_to_return + + params = { + 'action': 'query', + 'prop' : 'categories', + 'titles' : self.title(), + } + if not self.site().isAllowed('apihighlimits') and config.special_page_limit > 500: + params['cllimit'] = 500 + + + allDone = False + cats=[] + while not allDone: + output(u'Getting categories in %s via API...' % self.aslink()) + + datas = query.GetData(params, self.site()) + data=datas['query']['pages'].values()[0] + if "categories" in data: + for c in data['categories']: + cats.append(c['title']) +# if len(data) == 2: +# data = data[0] + data[1] +# else: +# data = data[0] + + if 'query-continue' in datas: + if 'categories' in datas['query-continue']: + params['clcontinue'] = datas['query-continue']['categories']['clcontinue'] + + else: + allDone = True + return cats + def __cmp__(self, other): """Test for equality and inequality of Page objects""" if not isinstance(other, Page):

1 0

SVN: [8135] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 28 Apr '10

28 Apr '10

Revision: 8135 Author: xqt Date: 2010-04-28 14:33:06 +0000 (Wed, 28 Apr 2010) Log Message: ----------- Bugfix: set throttle.getDelay(write=True) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-04-28 06:03:43 UTC (rev 8134) +++ trunk/pywikipedia/wikipedia.py 2010-04-28 14:33:06 UTC (rev 8135) @@ -7517,7 +7517,7 @@ remainingPages = page_put_queue.qsize() - 1 # -1 because we added a None element to stop the queue remainingSeconds = datetime.timedelta( - seconds=(remainingPages * put_throttle.getDelay(wait=True))) + seconds=(remainingPages * put_throttle.getDelay(True))) return (remainingPages, remainingSeconds) page_put_queue.put((None, None, None, None, None, None, None))

1 0

SVN: [8134] branches/rewrite/pywikibot/families
by xqt＠svn.wikimedia.org 28 Apr '10

28 Apr '10

Revision: 8134 Author: xqt Date: 2010-04-28 06:03:43 +0000 (Wed, 28 Apr 2010) Log Message: ----------- additional family files >= version 1.14 Added Paths: ----------- branches/rewrite/pywikibot/families/anarchopedia_family.py branches/rewrite/pywikibot/families/lyricwiki_family.py branches/rewrite/pywikibot/families/wikia_family.py Copied: branches/rewrite/pywikibot/families/anarchopedia_family.py (from rev 8132, trunk/pywikipedia/families/anarchopedia_family.py) =================================================================== --- branches/rewrite/pywikibot/families/anarchopedia_family.py (rev 0) +++ branches/rewrite/pywikibot/families/anarchopedia_family.py 2010-04-28 06:03:43 UTC (rev 8134) @@ -0,0 +1,152 @@ +# -*- coding: utf-8 -*- +import family + +# The Anarchopedia family + +class Family(family.Family): + def __init__(self): + family.Family.__init__(self) + self.name = 'anarchopedia' + + self.languages_by_size = [ + 'ar','sr','da','de','nl','el','en','fa','fi','fr','he','sr','hy','id','it','ja', + 'ko','lv','lit','no','sr','pl','pt','ro','ru','es','sq','sr','sv','tr','zh', + ] + for l in self.languages_by_size: + self.langs[l] = '%s.anarchopedia.org' % l + + self.namespaces[1]['fr'] = u'Discuter' + + self.namespaces[3]['fr'] = u'Discussion Utilisateur' + + self.namespaces[4] = { + '_default': u'Anarchopedia', + 'ar': u'أنارشوبيديا', + 'el': u'Αναρχοπαίδεια', + 'eo': u'Anarĥopedio', + 'es': u'Anarcopedia', + 'fa': u'آنارکوپديا', + 'he': u'אנרכופדיה', + 'hy': u'Անարխոպեդիա', + 'it': u'Anarcopedia', + 'ja': u'アナーキォペディア', + 'ko': u'아나코백과', + 'lv': u'Anarkopēdija', + 'pt': u'Anarcopédia', + 'ro': u'Anarhopedia', + 'ru': u'Анархопедия', + 'sq': u'Anarshipedia', + 'sr': u'Anarhopedija / Анархопедија', + 'tr': u'Anarşipedi', + 'zh': u'安那其百科', + } + self.namespaces[5] = { + '_default': u'Anarchopedia talk', + 'ar': u'نقاش أنارشوبيديا', + 'bs': u'Разговор о Anarchopedia', + 'da': u'Anarchopedia-diskussion', + 'de': u'Anarchopedia Diskussion', + 'el': u'Αναρχοπαίδεια συζήτηση', + 'es': u'Anarcopedia Discusión', + 'fa': u'بحث آنارکوپديا', + 'fi': u'Keskustelu Anarchopediasta', + 'fr': u'Discussion Anarchopedia', + 'he': u'שיחת אנרכופדיה', + 'hy': u'Անարխոպեդիայի քննարկում', + 'id': u'Pembicaraan Anarchopedia', + 'it': u'Discussioni Anarcopedia', + 'ja': u'アナーキォペディア‐ノート', + 'ko': u'아나코백과토론', + 'lv': u'Anarkopēdija diskusija', + 'nl': u'Overleg Anarchopedia', + 'no': u'Anarchopedia-diskusjon', + 'or': u'Anarchopedia-diskusjon', + 'pl': u'Dyskusja Anarchopedia', + 'pt': u'Anarcopédia Discussão', + 'ro': u'Discuţie Anarhopedia', + 'ru': u'Обсуждение Анархопедии', + 'sh': u'Разговор о Anarhopedija / Анархопедија', + 'sq': u'Anarshipedia diskutim', + 'sr': u'Разговор о Anarhopedija / Анархопедија', + 'sv': u'Anarchopediadiskussion', + 'tr': u'Anarşipedi tartışma', + 'zh': u'安那其百科 talk', + } + + self.namespaces[6]['tr'] = u'Resim' + self.namespaces[6]['da'] = u'Billede' + self.namespaces[6]['sq'] = u'Figura' + + self.namespaces[7]['da'] = u'Billeddiskussion' + self.namespaces[7]['fr'] = u'Discussion Fichier' + self.namespaces[7]['sq'] = u'Figura diskutim' + self.namespaces[7]['tr'] = u'Resim tartışma' + + + self.namespaces[11]['fr'] = u'Discussion Modèle' + + self.namespaces[13]['fr'] = u'Discussion Aide' + + self.namespaces[14]['sq'] = u'Kategori' + + self.namespaces[15]['fr'] = u'Discussion Catégorie' + self.namespaces[15]['sq'] = u'Kategori Diskutim' + + self.namespaces[100] = {'en':u'Focus'} + + self.namespaces[101] = {'en':u'Focus talk'} + + + self.nocapitalize = self.langs.keys() + + self.obsolete = { + 'ara': 'ar', + 'bos': 'bs', + 'zho': 'zh', + 'dan': 'da', + 'deu': 'de', + 'dut': 'nl', + 'ell': 'el', + 'eng': 'en', + 'epo': 'eo', + 'fas': 'fa', + 'fra': 'fr', + 'fin': 'fi', + 'heb': 'he', + 'ind': 'id', + 'ita': 'it', + 'jpn': 'ja', + 'lit': 'lt', + 'lav': 'lv', + 'nor': 'no', + 'nsh': 'sh', + 'pol': 'pl', + 'por': 'pt', + 'rum': 'ro', + 'rus': 'ru', + 'spa': 'es', + 'srp': 'sr', + 'srp': 'hr', + 'swe': 'sv', + 'kor': 'ko', + 'sqi': 'sq', + 'hye': 'hy', + 'tur': 'tr', + + 'ell': 'gre', + 'srp': 'hrv', + 'nno': None, + 'nob': None, + } + + def version(self, code): + return "1.14alpha" + + def scriptpath(self, code): + return '' + + def path(self, code): + return '/index.php' + + def apipath(self, code): + return '/api.php' Copied: branches/rewrite/pywikibot/families/lyricwiki_family.py (from rev 8132, trunk/pywikipedia/families/lyricwiki_family.py) =================================================================== --- branches/rewrite/pywikibot/families/lyricwiki_family.py (rev 0) +++ branches/rewrite/pywikibot/families/lyricwiki_family.py 2010-04-28 06:03:43 UTC (rev 8134) @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- + +import family + +# The LyricWiki family + +# user_config.py: +# usernames['lyricwiki']['en'] = 'user' + +class Family(family.Family): + def __init__(self): + family.Family.__init__(self) + self.name = 'lyricwiki' + self.langs = { + 'en': 'lyrics.wikia.com', + } + + self.namespaces[4] = { + '_default': [u'LyricWiki', self.namespaces[4]['_default']], + } + self.namespaces[5] = { + '_default': [u'LyricWiki talk', self.namespaces[5]['_default']], + } + self.namespaces[110] = { '_default': u'Forum', } + self.namespaces[111] = { '_default': u'Forum talk', } + self.namespaces[112] = { '_default': u'Gracenote', } + self.namespaces[113] = { '_default': u'Gracenote talk', } + self.namespaces[400] = { '_default': u'Video', } + self.namespaces[401] = { '_default': u'Video talk', } + self.namespaces[500] = { '_default': u'User blog', } + self.namespaces[501] = { '_default': u'User blog comment', } + self.namespaces[502] = { '_default': u'Blog', } + self.namespaces[503] = { '_default': u'Blog talk', } + + def version(self, code): + return "1.15.1" + + def scriptpath(self, code): + return '' + + def apipath(self, code): + return '/api.php' \ No newline at end of file Copied: branches/rewrite/pywikibot/families/wikia_family.py (from rev 8132, trunk/pywikipedia/families/wikia_family.py) =================================================================== --- branches/rewrite/pywikibot/families/wikia_family.py (rev 0) +++ branches/rewrite/pywikibot/families/wikia_family.py 2010-04-28 06:03:43 UTC (rev 8134) @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + +__version__ = '$Id$' + +import family + +# The Wikia Search family +# user-config.py: usernames['wikia']['wikia'] = 'User name' + +class Family(family.Family): + def __init__(self): + family.Family.__init__(self) + self.name = u'wikia' + + self.langs = { + u'wikia': None, + } + + self.namespaces[4] = { + '_default': [u'search', self.namespaces[4]['_default']], + } + self.namespaces[5] = { + '_default': [u'search talk', self.namespaces[5]['_default']], + } + self.namespaces[100] = { + '_default': u'Forum', + } + self.namespaces[101] = { + '_default': u'Forum talk', + } + self.namespaces[112] = { + '_default': u'Mini', + } + self.namespaces[113] = { + '_default': u'Mini talk', + } + + def hostname(self, code): + return u'www.wikia.com' + + def version(self, code): + return "1.15.1" + + def scriptpath(self, code): + return '' + + def apipath(self, code): + return '/api.php'

1 0

SVN: [8133]
by xqt＠svn.wikimedia.org 27 Apr '10

27 Apr '10

Revision: 8133 Author: xqt Date: 2010-04-27 16:45:03 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cross update from rewrite/trunk Modified Paths: -------------- branches/rewrite/scripts/redirect.py trunk/pywikipedia/redirect.py Modified: branches/rewrite/scripts/redirect.py =================================================================== --- branches/rewrite/scripts/redirect.py 2010-04-27 08:41:02 UTC (rev 8132) +++ branches/rewrite/scripts/redirect.py 2010-04-27 16:45:03 UTC (rev 8133) @@ -20,7 +20,7 @@ works with action "double". -namespace:n Namespace to process. Can be given multiple times, for several - namespaces. If omitted, only the main (article) namespace is + namespaces. If omitted, only the main (article) namespace is treated. -offset:n With -moves, the number of hours ago to start scanning moved @@ -144,19 +144,11 @@ 'zh-yue': u'機械人：跳轉目標唔存在', } -# Summary message for putting broken redirect to speedy delete -sd_tagging_sum = { - 'ar': u'روبوت: وسم للحذف السريع', - 'cs': u'Robot označil ke smazání', - 'en': u'Robot: Tagging for speedy deletion', - 'ga': u'Róbó: Ag maircáil le luas-scrios', - 'it': u'Bot: +Da cancellare subito', - 'ja': u'ロボットによる:迷子のリダイレクトを即時削除へ', - 'ksh':u'Bot: Di Ömlëijdong jeiht noh nörjendwoh.', - 'nds':u'Bot: Kaputte Wiederleiden ward nich brukt', - 'nl': u'Bot: gemarkeerd voor snelle verwijdering', - 'war':u'Robot: Nautod o nagbinalikbalik nga redirek', - 'zh': u'機器人: 將損壞的重定向提報快速刪除', +# 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', } # Insert deletion template into page with a broken redirect @@ -192,6 +184,8 @@ self.api_start = start self.api_until = until self.api_number = number + if self.api_number is None: + self.api_number = 'max' ## def get_redirects_from_dump(self, alsoGetPageTitles=False): ## ''' @@ -319,7 +313,7 @@ data = gen.submit() if 'error' in data: raise RuntimeError("API query error: %s" % data) - if data == [] or "query" not in data: + if data == [] or 'query' not in data: raise RuntimeError("No results given.") redirects = {} pages = {} @@ -522,7 +516,7 @@ redir_page.delete(reason, prompt = False) except pywikibot.NoUsername: if targetPage.site().lang in sd_template \ - and targetPage.site().lang in sd_tagging_sum: + and targetPage.site().lang in reason_broken: pywikibot.output( u"No sysop in user-config.py, put page to speedy deletion.") content = redir_page.get(get_redirect=True) @@ -531,7 +525,7 @@ sd_template)+"\n"+content summary = pywikibot.translate( targetPage.site().lang, - sd_tagging_sum) + reason_broken) redir_page.put(content, summary) except pywikibot.IsRedirectPage: @@ -609,11 +603,15 @@ else: pywikibot.output( u' Links to: %s.' - % targetPage.title(asLink=True)) + % targetPage.title(asLink=True)) + if targetPage.site().sitename() == 'wikipedia:en' \ + and targetPage.title() == 'Target page name': + pywikibot.output(u"Skipping: Redirect source is vandalized.") + break if targetPage.site() != self.site: pywikibot.output( - u'Warning: redirect target (%s) is on a different site.' - % (targetPage.title(asLink=True))) + u'Warning: redirect target (%s) is on a different site.' + % (targetPage.title(asLink=True))) if self.always: break # skip if automatic # watch out for redirect loops @@ -622,8 +620,8 @@ targetPage.title(withSection=False)) ) > 0: pywikibot.output( - u'Warning: Redirect target %s forms a redirect loop.' - % targetPage.title(asLink=True)) + u'Warning: Redirect target %s forms a redirect loop.' + % targetPage.title(asLink=True)) break ###xqt doesn't work. edits twice! try: content = targetPage.get(get_redirect=True) @@ -680,8 +678,8 @@ % redir.title()) except pywikibot.Error, error: pywikibot.output( - u"Unexpected error occurred trying to save [[%s]]: %s" - % (redir.title(), error)) + u"Unexpected error occurred trying to save [[%s]]: %s" + % (redir.title(), error)) break def fix_double_or_delete_broken_redirects(self): Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-04-27 08:41:02 UTC (rev 8132) +++ trunk/pywikipedia/redirect.py 2010-04-27 16:45:03 UTC (rev 8133) @@ -20,24 +20,24 @@ (http://download.wikimedia.org). Argument can also be given as "-xml:filename.xml". Cannot be used with -api or -moves. +-api Retrieve information from the wiki via MediaWikis application + program interface (API). Cannot be used with -xml. + -moves Use the page move log to find double-redirect candidates. Only works with action "double", does not work with -xml. You may use -api option for retrieving pages via API --api Retrieve information from the wiki via MediaWikis application - program interface (API). Cannot be used with -xml. - NOTE: If neither of -xml -api -moves is given, info will be loaded from a special page of the live wiki. --namespace:n Namespace to process. Works only with an XML dump, or the API - interface. Can be given multiple times, for several namespaces. - If omitted, with -xml all namespaces are treated, with -api - only the main (article) namespace is treated. +-namespace:n Namespace to process. Can be given multiple times, for several + namespaces. If omitted, only the main (article) namespace is + is treated with -api, with -xml all namespaces are treated, + Works only with an XML dump, or the API interface. --offset:n With -xml, the number of the redirect to restart with (see - progress). With -moves, the number of hours ago to start - scanning moved pages. Otherwise, ignored. +-offset:n With -moves, the number of hours ago to start scanning moved + pages. With -xml, the number of the redirect to restart with + (see progress). Otherwise, ignored. -start:title With -api, the starting page title in each namespace. Otherwise ignored. Page needs not exist. @@ -59,7 +59,8 @@ # # from __future__ import generators -import wikipedia, config, query +import wikipedia as pywikibot +import config, query import xmlreader import re, sys, datetime @@ -179,7 +180,7 @@ def __init__(self, xmlFilename=None, namespaces=[], offset=-1, use_move_log=False, use_api=False, start=None, until=None, number=None): - self.site = wikipedia.getSite() + self.site = pywikibot.getSite() self.xmlFilename = xmlFilename self.namespaces = namespaces if use_api and self.namespaces == []: @@ -212,9 +213,9 @@ readPagesCount += 1 # always print status message after 10000 pages if readPagesCount % 10000 == 0: - wikipedia.output(u'%i pages read...' % readPagesCount) + pywikibot.output(u'%i pages read...' % readPagesCount) if len(self.namespaces) > 0: - if wikipedia.Page(self.site, entry.title).namespace() \ + if pywikibot.Page(self.site, entry.title).namespace() \ not in self.namespaces: continue if alsoGetPageTitles: @@ -233,7 +234,7 @@ if target.startswith(':'): target = target[1:] else: - wikipedia.output( + pywikibot.output( u'NOTE: Ignoring %s which is a redirect to %s:' % (entry.title, code)) target = None @@ -245,13 +246,13 @@ # remove leading and trailing whitespace target = target.strip('_') # capitalize the first letter - if not wikipedia.getSite().nocapitalize: + if not pywikibot.getSite().nocapitalize: source = source[:1].upper() + source[1:] target = target[:1].upper() + target[1:] if '#' in target: target = target[:target.index('#')].rstrip("_") if '|' in target: - wikipedia.output( + pywikibot.output( u'HINT: %s is a redirect with a pipelink.' % entry.title) target = target[:target.index('|')].rstrip("_") @@ -263,9 +264,7 @@ return redict def get_redirect_pageids_via_api(self): - """ - Return generator that yields page IDs of Pages that are redirects. - """ + """Return generator that yields page IDs of Pages that are redirects.""" params = { 'action': 'query', 'list': 'allpages', @@ -280,7 +279,7 @@ params['apfrom'] = self.api_start done = False while not done: - wikipedia.output(u'\nRetrieving pages...', newline=False) + pywikibot.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']) @@ -293,7 +292,7 @@ else: break - def _next_redirects_via_api_commandline(self): + def _next_redirect_group(self): """ Return a generator that retrieves pageids from the API 500 at a time and yields them as a list @@ -334,13 +333,13 @@ 'redirects':1, #'':'', } - for apiQ in self._next_redirects_via_api_commandline(): + for apiQ in self._next_redirect_group(): params['pageids'] = apiQ - wikipedia.output(u'.', newline=False) + pywikibot.output(u'.', newline=False) data = query.GetData(params, self.site) if 'error' in data: raise RuntimeError("API query error: %s" % data) - if data == []: + if data == [] or 'query' not in data: raise RuntimeError("No results given.") redirects = {} pages = {} @@ -387,7 +386,7 @@ # retrieve information from the live wiki's maintenance page # broken redirect maintenance page's URL path = self.site.broken_redirects_address(default_limit=False) - wikipedia.output(u'Retrieving special page...') + pywikibot.output(u'Retrieving special page...') maintenance_txt = self.site.getUrl(path) # regular expression which finds redirects which point to a @@ -395,13 +394,13 @@ Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)"') redir_names = Rredir.findall(maintenance_txt) - wikipedia.output(u'Retrieved %d redirects from special page.\n' + pywikibot.output(u'Retrieved %d redirects from special page.\n' % len(redir_names)) for redir_name in redir_names: yield redir_name else: # retrieve information from XML dump - wikipedia.output( + pywikibot.output( u'Getting a list of all redirects and of all page titles...') redirs, pageTitles = self.get_redirects_from_dump( alsoGetPageTitles=True) @@ -424,24 +423,24 @@ elif self.xmlFilename == None: if self.use_move_log: if self.use_api: - gen = self.get_moved_pages_redirects_via_api() + gen = self.get_moved_pages_redirects() else: - gen = self.get_moved_pages_redirects() + gen = self.get_moved_pages_redirects_old() for redir_page in gen: yield redir_page.title() return # retrieve information from the live wiki's maintenance page # double redirect maintenance page's URL -# wikipedia.config.special_page_limit = 1000 +# pywikibot.config.special_page_limit = 1000 path = self.site.double_redirects_address(default_limit = False) - wikipedia.output(u'Retrieving special page...') + pywikibot.output(u'Retrieving special page...') maintenance_txt = self.site.getUrl(path) # regular expression which finds redirects which point to # another redirect inside the HTML Rredir = re.compile('\<li\>\<a href=".+?" title="(.*?)">') redir_names = Rredir.findall(maintenance_txt) - wikipedia.output(u'Retrieved %i redirects from special page.\n' + pywikibot.output(u'Retrieved %i redirects from special page.\n' % len(redir_names)) for redir_name in redir_names: yield redir_name @@ -454,40 +453,44 @@ # redirect as well if num > self.offset and value in redict: yield key - wikipedia.output(u'\nChecking redirect %i of %i...' + pywikibot.output(u'\nChecking redirect %i of %i...' % (num + 1, len(redict))) - def get_moved_pages_redirects_via_api(self): + def get_moved_pages_redirects(self): + '''generate redirects to recently-moved pages''' + # this will run forever, until user interrupts it + if self.offset <= 0: self.offset = 1 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") - wikipedia.output(u'Retrieving %d moved pages via API...' + pywikibot.output(u'Retrieving %d moved pages via API...' % self.api_number) - if wikipedia.verbose: - wikipedia.output(u"[%s]" % offset_time) + if pywikibot.verbose: + pywikibot.output(u"[%s]" % offset_time) for moved_page,u,t,c in self.site.logpages(number=self.api_number, mode='move', start=offset_time): try: if not moved_page.isRedirectPage(): continue - except wikipedia.BadTitle: + except pywikibot.BadTitle: continue - except wikipedia.ServerError: + except pywikibot.ServerError: continue + # 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): yield page - except wikipedia.NoPage: + except pywikibot.NoPage: # original title must have been deleted after move continue - def get_moved_pages_redirects(self): - '''generate redirects to recently-moved pages''' - # this will run forever, until user interrupts it + def get_moved_pages_redirects_old(self): move_regex = re.compile( r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') @@ -508,23 +511,23 @@ % offset_time try: move_list = self.site.getUrl(move_url) - if wikipedia.verbose: - wikipedia.output(u"[%s]" % offset_time) + if pywikibot.verbose: + pywikibot.output(u"[%s]" % offset_time) except: import traceback - wikipedia.output(unicode(traceback.format_exc())) + pywikibot.output(unicode(traceback.format_exc())) return g = move_regex.findall(move_list) - if wikipedia.verbose: - wikipedia.output(u"%s moved pages" % len(g)) + if pywikibot.verbose: + pywikibot.output(u"%s moved pages" % len(g)) for moved_title in g: - moved_page = wikipedia.Page(self.site, moved_title) + moved_page = pywikibot.Page(self.site, moved_title) try: if not moved_page.isRedirectPage(): continue - except wikipedia.BadTitle: + except pywikibot.BadTitle: continue - except wikipedia.ServerError: + except pywikibot.ServerError: continue # moved_page is now a redirect, so any redirects pointing # to it need to be changed @@ -532,7 +535,7 @@ for page in moved_page.getReferences(follow_redirects=True, redirectsOnly=True): yield page - except wikipedia.NoPage: + except pywikibot.NoPage: # original title must have been deleted after move continue m = offsetpattern.search(move_list) @@ -542,7 +545,7 @@ class RedirectRobot: def __init__(self, action, generator, always=False, number=None): - self.site = wikipedia.getSite() + self.site = pywikibot.getSite() self.action = action self.generator = generator self.always = always @@ -551,7 +554,7 @@ def prompt(self, question): if not self.always: - choice = wikipedia.inputChoice(question, + choice = pywikibot.inputChoice(question, ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'n': @@ -565,59 +568,59 @@ def delete_broken_redirects(self): # get reason for deletion text - reason = wikipedia.translate(self.site, reason_broken) + reason = pywikibot.translate(self.site, reason_broken) for redir_name in self.generator.retrieve_broken_redirects(): self.delete_1_broken_redirect( redir_name, reason) if self.exiting: break def delete_1_broken_redirect(self, redir_name, reason): - redir_page = wikipedia.Page(self.site, redir_name) + redir_page = pywikibot.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} <<<" + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % redir_page.title()) try: targetPage = redir_page.getRedirectTarget() - except wikipedia.IsNotRedirectPage: - wikipedia.output(u'%s is not a redirect.' % redir_page.title()) - except wikipedia.NoPage: - wikipedia.output(u'%s doesn\'t exist.' % redir_page.title()) + except pywikibot.IsNotRedirectPage: + pywikibot.output(u'%s is not a redirect.' % redir_page.title()) + except pywikibot.NoPage: + pywikibot.output(u'%s doesn\'t exist.' % redir_page.title()) else: try: targetPage.get() - except wikipedia.NoPage: + except pywikibot.NoPage: 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: + except pywikibot.NoUsername: if targetPage.site().lang in sd_template \ and targetPage.site().lang in reason_broken: - wikipedia.output( + pywikibot.output( u"No sysop in user-config.py, put page to speedy deletion.") content = redir_page.get(get_redirect=True) - content = wikipedia.translate( + content = pywikibot.translate( targetPage.site().lang, sd_template)+"\n"+content - summary = wikipedia.translate( + summary = pywikibot.translate( targetPage.site().lang, reason_broken) redir_page.put(content, summary) - except wikipedia.IsRedirectPage: - wikipedia.output( + except pywikibot.IsRedirectPage: + pywikibot.output( 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( + pywikibot.output( u'Redirect target %s does exist! Won\'t delete anything.' % targetPage.aslink()) - wikipedia.output(u'') + pywikibot.output(u'') def fix_double_redirects(self): for redir_name in self.generator.retrieve_double_redirects(): @@ -626,10 +629,10 @@ break def fix_1_double_redirect(self, redir_name): - redir = wikipedia.Page(self.site, redir_name) + redir = pywikibot.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} <<<" + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % redir.title()) newRedir = redir redirList = [] # bookkeeping to detect loops @@ -638,57 +641,57 @@ newRedir.sectionFreeTitle())) try: targetPage = newRedir.getRedirectTarget() - except wikipedia.IsNotRedirectPage: + except pywikibot.IsNotRedirectPage: if len(redirList) == 1: - wikipedia.output(u'Skipping: Page %s is not a redirect.' + pywikibot.output(u'Skipping: Page %s is not a redirect.' % redir.aslink()) break #do nothing elif len(redirList) == 2: - wikipedia.output( + pywikibot.output( u'Skipping: Redirect target %s is not a redirect.' % newRedir.aslink()) break # do nothing - except wikipedia.SectionError: - wikipedia.output( + except pywikibot.SectionError: + pywikibot.output( u'Warning: Redirect target section %s doesn\'t exist.' % newRedir.aslink()) - except wikipedia.BadTitle, e: + except pywikibot.BadTitle, e: # str(e) is in the format 'BadTitle: [[Foo]]' - wikipedia.output( + pywikibot.output( u'Warning: Redirect target %s is not a valid page title.' % str(e)[10:]) #sometimes this error occures. Invalid Title starting with a '#' - except wikipedia.InvalidTitle, err: - wikipedia.output(u'Warning: %s' % err) + except pywikibot.InvalidTitle, err: + pywikibot.output(u'Warning: %s' % err) break - except wikipedia.NoPage: + except pywikibot.NoPage: if len(redirList) == 1: - wikipedia.output(u'Skipping: Page %s does not exist.' + pywikibot.output(u'Skipping: Page %s does not exist.' % redir.aslink()) break else: if self.always: - wikipedia.output( + pywikibot.output( u"Skipping: Redirect target %s doesn't exist." % newRedir.aslink()) break # skip if automatic else: - wikipedia.output( + pywikibot.output( u"Warning: Redirect target %s doesn't exist." % newRedir.aslink()) - except wikipedia.ServerError: - wikipedia.output(u'Skipping: Server Error') + except pywikibot.ServerError: + pywikibot.output(u'Skipping: Server Error') break else: - wikipedia.output( + pywikibot.output( u' Links to: %s.' % targetPage.aslink()) if targetPage.site().sitename() == 'wikipedia:en' \ and targetPage.title() == 'Target page name': - wikipedia.output(u"Skipping: Redirect source is vandalized.") + pywikibot.output(u"Skipping: Redirect source is vandalized.") break if targetPage.site() != self.site: - wikipedia.output( + pywikibot.output( u'Warning: redirect target (%s) is on a different site.' % (targetPage.aslink())) if self.always: @@ -698,36 +701,36 @@ % (targetPage.site().lang, targetPage.sectionFreeTitle()) ) > 0: - wikipedia.output( + pywikibot.output( u'Warning: Redirect target %s forms a redirect loop.' % targetPage.aslink()) break ###xqt doesn't work. edits twice! try: content = targetPage.get(get_redirect=True) - except wikipedia.SectionError: - content = wikipedia.Page( + except pywikibot.SectionError: + content = pywikibot.Page( targetPage.site(), targetPage.sectionFreeTitle() ).get(get_redirect=True) if targetPage.site().lang in sd_template \ and targetPage.site().lang in sd_tagging_sum: - wikipedia.output(u"Tagging redirect for deletion") + pywikibot.output(u"Tagging redirect for deletion") # Delete the two redirects - content = wikipedia.translate( + content = pywikibot.translate( targetPage.site().lang, sd_template)+"\n"+content - summ = wikipedia.translate(targetPage.site().lang, + summ = pywikibot.translate(targetPage.site().lang, sd_tagging_sum) targetPage.put(content, summ) redir.put(content, summ) break # TODO Better implement loop redirect else: newRedir = targetPage - continue # + continue try: oldText = redir.get(get_redirect=True) - except wikipedia.BadTitle: - wikipedia.output(u"Bad Title Error") + except pywikibot.BadTitle: + pywikibot.output(u"Bad Title Error") break text = self.site.redirectRegex().sub( '#%s %s' % @@ -736,35 +739,35 @@ oldText) if text == oldText: break - summary = wikipedia.translate(self.site, msg_double)\ + summary = pywikibot.translate(self.site, msg_double)\ % targetPage.aslink() - wikipedia.showDiff(oldText, text) + pywikibot.showDiff(oldText, text) if self.prompt(u'Do you want to accept the changes?'): try: redir.put(text, summary) - except wikipedia.LockedPage: - wikipedia.output(u'%s is locked.' % redir.title()) - except wikipedia.SpamfilterError, error: - wikipedia.output( + except pywikibot.LockedPage: + pywikibot.output(u'%s is locked.' % redir.title()) + except pywikibot.SpamfilterError, error: + pywikibot.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" + except pywikibot.PageNotSaved, error: + pywikibot.output(u"Saving page [[%s]] failed: %s" % (redir.title(), error)) - except wikipedia.NoUsername: - wikipedia.output( + except pywikibot.NoUsername: + pywikibot.output( u"Page [[%s]] not saved; sysop privileges required." % redir.title()) - except wikipedia.Error, error: - wikipedia.output( + except pywikibot.Error, error: + pywikibot.output( u"Unexpected error occurred trying to save [[%s]]: %s" - % (redir.title(), error)) + % (redir.title(), error)) break def fix_double_or_delete_broken_redirects(self): # TODO: part of this should be moved to generator, the rest merged into self.run() # get reason for deletion text - delete_reason = wikipedia.translate(self.site, reason_broken) + delete_reason = pywikibot.translate(self.site, reason_broken) count = 0 for (redir_name, code, target, final)\ in self.generator.get_redirects_via_api(maxlen=2): @@ -780,8 +783,8 @@ break def run(self): - # TODO: make all generators return a redicet type indicator, - # thus make them usabile with 'both' + # TODO: make all generators return a redirect type indicator, + # thus make them usable with 'both' if self.action == 'double': self.fix_double_redirects() elif self.action == 'broken': @@ -810,7 +813,7 @@ until = '' number = None always = False - for arg in wikipedia.handleArgs(*args): + for arg in pywikibot.handleArgs(*args): if arg == 'double' or arg == 'do': action = 'double' elif arg == 'broken' or arg == 'br': @@ -821,7 +824,7 @@ api = True elif arg.startswith('-xml'): if len(arg) == 4: - xmlFilename = wikipedia.input( + xmlFilename = pywikibot.input( u'Please enter the XML dump\'s filename: ') else: xmlFilename = arg[5:] @@ -831,7 +834,7 @@ ns = arg[11:] if ns == '': ## "-namespace:" does NOT yield -namespace:0 further down the road! - ns = wikipedia.input( + ns = pywikibot.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. @@ -855,11 +858,11 @@ elif arg == '-always': always = True else: - wikipedia.output(u'Unknown argument: %s' % arg) + pywikibot.output(u'Unknown argument: %s' % arg) if not action or (xmlFilename and moved_pages)\ or (api and xmlFilename): - wikipedia.showHelp('redirect') + pywikibot.showHelp('redirect') else: gen = RedirectGenerator(xmlFilename, namespaces, offset, moved_pages, api, start, until, number) @@ -870,4 +873,4 @@ try: main() finally: - wikipedia.stopme() + pywikibot.stopme()

1 0

SVN: [8132] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 27 Apr '10

27 Apr '10

Revision: 8132 Author: xqt Date: 2010-04-27 08:41:02 +0000 (Tue, 27 Apr 2010) Log Message: ----------- use the right time lag; bugfix for #2992437 Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-04-26 07:59:35 UTC (rev 8131) +++ trunk/pywikipedia/wikipedia.py 2010-04-27 08:41:02 UTC (rev 8132) @@ -641,7 +641,6 @@ output("The IP address is blocked, retry by login.") self.site().forceLogin(sysop=sysop) return self.get(force, get_redirect, throttle, sysop, change_edit_time) - return self._contents def _getEditPage(self, get_redirect=False, throttle=True, sysop=False, @@ -1536,10 +1535,17 @@ # Determine if we are allowed to edit if not force: if not self.botMayEdit(username): - raise LockedPage(u'Not allowed to edit %s because of a restricting template' % self.aslink()) - elif self.site().has_api() and self.namespace() in [2,3] and ( '.css' in self.title() or '.js' in self.title()): - # API enable: if title is .css or .js in ns2,3 , it need permission `editusercssjs` - sysop = self._getActionUser(action = 'editusercssjs', restriction = self.editRestriction, sysop=True) + raise LockedPage( + u'Not allowed to edit %s because of a restricting template' + % self.aslink()) + elif self.site().has_api() and self.namespace() in [2,3] \ + and (self.title().endswith('.css') or \ + self.title().endswith('.js')): + # API enable: if title ends with .css or .js in ns2,3 + # it needs permission 'editusercssjs' + sysop = self._getActionUser(action='editusercssjs', + restriction=self.editRestriction, + sysop=True) # If there is an unchecked edit restriction, we need to load the page if self._editrestriction: @@ -1741,8 +1747,9 @@ #cannot handle longpageerror and PageNoSave yet if errorCode == 'maxlag' or response.code == 503: # server lag; wait for the lag time and retry - m = re.search('Waiting for (.+?): (.+?) seconds lagged', data['error']['info']) - timelag = int(m.group(2)) + lagpattern = re.compile(r"Waiting for [\d.]+: (?P<lag>\d+) seconds? lagged") + lag = lagpattern.search(data['error']['info']) + timelag = int(lag.group("lag")) output(u"Pausing %d seconds due to database server lag." % min(timelag,300)) dblagged = True time.sleep(min(timelag,300)) @@ -7510,7 +7517,7 @@ remainingPages = page_put_queue.qsize() - 1 # -1 because we added a None element to stop the queue remainingSeconds = datetime.timedelta( - seconds=(remainingPages * put_throttle.getDelay())) + seconds=(remainingPages * put_throttle.getDelay(wait=True))) return (remainingPages, remainingSeconds) page_put_queue.put((None, None, None, None, None, None, None))

1 0

SVN: [8131] trunk/pywikipedia/noreferences.py
by xqt＠svn.wikimedia.org 26 Apr '10

26 Apr '10

Revision: 8131 Author: xqt Date: 2010-04-26 07:59:35 +0000 (Mon, 26 Apr 2010) Log Message: ----------- localisations for eo-wiki Modified Paths: -------------- trunk/pywikipedia/noreferences.py Modified: trunk/pywikipedia/noreferences.py =================================================================== --- trunk/pywikipedia/noreferences.py 2010-04-26 07:33:31 UTC (rev 8130) +++ trunk/pywikipedia/noreferences.py 2010-04-26 07:59:35 UTC (rev 8131) @@ -49,6 +49,7 @@ 'cs':u'Robot doplnil chybějící <references />', 'de':u'Bot: Trage fehlendes <references /> nach', 'en':u'Robot: Adding missing <references /> tag', + 'eo':u'Roboto: Aldono de "<references />"', 'fi':u'Botti lisäsi puuttuvan {{viitteet}}-mallineen', 'he':u'בוט: מוסיף תגית <references /> חסרה', 'hu':u'Hiányzó {{Források}} pótlása', @@ -91,6 +92,13 @@ u'See also', u'Notes' ], + 'eo': [ + u'Eksteraj ligiloj', + u'Ekstera ligilo', + u'Eksteraj ligoj', + u'Ekstera ligo', + u'Rete' + ], 'es': [ u'Enlaces externos', u'Véase también', @@ -184,6 +192,9 @@ u'Footnotes', u'Notes', ], + 'eo': [ + u'Referencoj', + ], 'es': [ u'Referencias', u'Notas', @@ -271,6 +282,7 @@ 'en': [u'Reflist',u'Refs',u'FootnotesSmall',u'Reference', u'Ref-list',u'Reference list',u'References-small',u'Reflink', u'Footnotes',u'FootnotesSmall'], + 'eo': [u'Referencoj'], 'es': ['Listaref', 'Reflist', 'muchasref'], 'fi': [u'Viitteet', u'Reflist'], 'fr': [u'Références',u'Notes', u'References', u'Reflist'],

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn April 2010