Pywikipedia-svn March 2010

pywikipedia-svn@lists.wikimedia.org

6 participants
70 discussions

SVN: [8024] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 18 Mar '10

18 Mar '10

Revision: 8024 Author: xqt Date: 2010-03-18 14:27:48 +0000 (Thu, 18 Mar 2010) Log Message: ----------- Do not yield a page in logpages() if result['query']['logevents'][index].has_key('actionhidden') Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-03-18 07:16:02 UTC (rev 8023) +++ trunk/pywikipedia/wikipedia.py 2010-03-18 14:27:48 UTC (rev 8024) @@ -4027,8 +4027,8 @@ # TODO: why isn't this a Site method? pages = list(pages) # if pages is an iterator, we need to make it a list output(u'Getting %d pages from %s' % (len(pages), site), newline=False) - #if site.has_api(): - # output(u' via API', newline=False) + if site.has_api() and debug: + output(u' via API', newline=False) output(u'...') limit = config.special_page_limit / 4 # default is 500/4, but It might have good point for server. if len(pages) > limit: @@ -4935,7 +4935,7 @@ if config.retry_on_fail: retry_attempt += 1 if retry_attempt > config.maxretries: - raise ServerError() + raise MaxTriesExceededError() output(u"""WARNING: Could not open '%s'.\nMaybe the server is down. Retrying in %i minutes...""" % (url, retry_idle_time)) time.sleep(retry_idle_time * 60) @@ -5703,7 +5703,8 @@ output('%s' % result) raise Error for c in result['query']['logevents']: - if not namespace or c['ns'] in namespace: + if (not namespace or c['ns'] in namespace) and \ + not c.has_key('actionhidden'): yield (Page(self, c['title'], defaultNamespace=c['ns']), c['user'], parsetime2stamp(c['timestamp']),

1 0

SVN: [8023] trunk/pywikipedia/weblinkchecker.py
by xqt＠svn.wikimedia.org 18 Mar '10

18 Mar '10

Revision: 8023 Author: xqt Date: 2010-03-18 07:16:02 +0000 (Thu, 18 Mar 2010) Log Message: ----------- insert debug information for #2972249 Modified Paths: -------------- trunk/pywikipedia/weblinkchecker.py Modified: trunk/pywikipedia/weblinkchecker.py =================================================================== --- trunk/pywikipedia/weblinkchecker.py 2010-03-18 06:46:50 UTC (rev 8022) +++ trunk/pywikipedia/weblinkchecker.py 2010-03-18 07:16:02 UTC (rev 8023) @@ -420,7 +420,11 @@ if isinstance(error, basestring): msg = error else: - msg = error[1] + try: + msg = error[1] + except IndexError: + print u'### DEBUG information for #2972249' + raise IndexError, error # TODO: decode msg. On Linux, it's encoded in UTF-8. # How is it encoded in Windows? Or can we somehow just # get the English message?

1 0

SVN: [8022]
by xqt＠svn.wikimedia.org 18 Mar '10

18 Mar '10

Revision: 8022 Author: xqt Date: 2010-03-18 06:46:50 +0000 (Thu, 18 Mar 2010) Log Message: ----------- patch #2972270 for bug #2970428 (not striping | following link). Thanks masti. Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py trunk/pywikipedia/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2010-03-17 17:55:22 UTC (rev 8021) +++ branches/rewrite/pywikibot/textlib.py 2010-03-18 06:46:50 UTC (rev 8022) @@ -7,7 +7,7 @@ """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikipedia bot team, 2008-2010 # # Distributed under the terms of the MIT license. # @@ -92,7 +92,8 @@ # this matches internal wikilinks, but also interwiki, categories, and # images. 'link': re.compile(r'\[\[[^\]\|]*(\|[^\]]*)?\]\]'), - 'interwiki': re.compile(r'(?i)\[\[(%s)\s?:[^\]]*\]\][\s]*' + # also finds links to foreign sites with preleading ":" + 'interwiki': re.compile(r'(?i)\[\[:?(%s)\s?:[^\]]*\]\][\s]*' % '|'.join(site.validLanguageLinks() + site.family.obsolete.keys()) ), @@ -678,7 +679,7 @@ # Note: While allowing parenthesis inside URLs, MediaWiki will regard # right parenthesis at the end of the URL as not part of that URL. # The same applies to dot, comma, colon and some other characters. - notAtEnd = '\]\s\)\.:;,<>"' + notAtEnd = '\]\s\)\.:;,<>"\|' # So characters inside the URL can be anything except whitespace, # closing squared brackets, quotation marks, greater than and less # than, and the last character also can't be parenthesis or another Modified: trunk/pywikipedia/pywikibot/textlib.py =================================================================== --- trunk/pywikipedia/pywikibot/textlib.py 2010-03-17 17:55:22 UTC (rev 8021) +++ trunk/pywikipedia/pywikibot/textlib.py 2010-03-18 06:46:50 UTC (rev 8022) @@ -680,7 +680,7 @@ # Note: While allowing parenthesis inside URLs, MediaWiki will regard # right parenthesis at the end of the URL as not part of that URL. # The same applies to dot, comma, colon and some other characters. - notAtEnd = '\]\s\)\.:;,<>"' + notAtEnd = '\]\s\)\.:;,<>"\|' # So characters inside the URL can be anything except whitespace, # closing squared brackets, quotation marks, greater than and less # than, and the last character also can't be parenthesis or another

1 0

SVN: [8021] branches/rewrite/pywikibot/families
by xqt＠svn.wikimedia.org 17 Mar '10

17 Mar '10

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

1 0

SVN: [8020] trunk/pywikipedia/interwiki.py
by xqt＠svn.wikimedia.org 17 Mar '10

17 Mar '10

Revision: 8020 Author: xqt Date: 2010-03-17 17:31:46 +0000 (Wed, 17 Mar 2010) Log Message: ----------- subpage templates for fr-wiki (patch #2971318 by masti) Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2010-03-17 11:46:25 UTC (rev 8019) +++ trunk/pywikipedia/interwiki.py 2010-03-17 17:31:46 UTC (rev 8020) @@ -508,8 +508,15 @@ u'documentation, template'], u'/doc'), 'es' : ([u'documentación', u'documentación de plantilla'], u'/doc'), 'eu' : (u'txantiloi dokumentazioa', u'/dok'), - 'fi' : (u'mallineohje', None), # no idea how to handle this type of subpage at :Metasivu: - 'fr' : (u'/documentation', u'/Documentation'), + # fi: no idea how to handle this type of subpage at :Metasivu: + 'fi' : (u'mallineohje', None), + 'fr' : ([u'/documentation', u'documentation', u'doc_modèle', + u'documentation modèle', u'documentation modèle compliqué', + u'documentation modèle en sous-page', + u'documentation modèle compliqué en sous-page', + u'documentation modèle utilisant les parserfunctions en sous-page', + ], + u'/Documentation'), 'hu' : (u'sablondokumentáció', u'/doc'), 'id' : (u'template doc', u'/doc'), 'ja' : (u'documentation', u'/doc'),

1 0

SVN: [8019] trunk/pywikipedia
by xqt＠svn.wikimedia.org 17 Mar '10

17 Mar '10

Revision: 8019 Author: xqt Date: 2010-03-17 11:46:25 +0000 (Wed, 17 Mar 2010) Log Message: ----------- bugfix for -log/-nolog option, bugfix for site.isAllowed('apihighlimits') reading from log Modified Paths: -------------- trunk/pywikipedia/pagegenerators.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2010-03-17 07:00:43 UTC (rev 8018) +++ trunk/pywikipedia/pagegenerators.py 2010-03-17 11:46:25 UTC (rev 8019) @@ -1195,7 +1195,7 @@ gen = YahooSearchPageGenerator(arg[7:]) elif arg.startswith('-'): mode, log, user = arg.partition('log') - if log == 'log': + if log == 'log' and mode not in ['-', '-no']: #exclude -log, -nolog number = 500 if not user: user = None Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-03-17 07:00:43 UTC (rev 8018) +++ trunk/pywikipedia/wikipedia.py 2010-03-17 11:46:25 UTC (rev 8019) @@ -3663,12 +3663,8 @@ def run(self): if self.pages: - doAPI = None - # API Implemented Check - # doAPI = self.site.has_api() # Sometimes query does not contains revisions - - if doAPI: + if self.site.has_api() and debug: while True: try: data = self.getDataApi() @@ -3874,21 +3870,25 @@ def oneDoneApi(self, data): title = data['title'] - editRestriction = '' - moveRestriction = '' - try: - username = data['revisions'][0]['user'] - ipedit = 'anon' in data['revisions'][0] - timestamp = data['revisions'][0]['timestamp'] - text = data['revisions'][0]['*'] + if not ('missing' in data or 'invalid' in data): + revisionId = data['lastrevid'] + rev = None + try: + rev = data['revisions'] + except KeyError: + raise u'NOTE: Last revision of [[%s]] not found' % title + else: + username = rev[0]['user'] + ipedit = 'anon' in rev[0] + timestamp = rev[0]['timestamp'] + text = rev[0]['*'] + editRestriction = '' + moveRestriction = '' for revs in data['protection']: if revs['type'] == 'edit': editRestriction = revs['level'] elif revs['type'] == 'move': moveRestriction = revs['level'] - revisionId = data['lastrevid'] - except KeyError: - pass page = Page(self.site, title) successful = False @@ -3913,13 +3913,15 @@ if editRestriction == 'autoconfirmed': page2._editrestriction = True page2._permalink = revisionId - page2._userName = username - page2._ipedit = ipedit + if rev: + page2._userName = username + page2._ipedit = ipedit + page2._editTime = timestamp + page2._contents = text + else: + raise u'BUG?>>: Last revision of [[%s]] not found' % title page2._revisionId = revisionId - page2._editTime = timestamp section = page2.section() - # Store the content - page2._contents = text if 'redirect' in data: ## output(u"%s is a redirect" % page2.aslink()) m = self.site.redirectRegex().match(text) @@ -4029,7 +4031,6 @@ # output(u' via API', newline=False) output(u'...') limit = config.special_page_limit / 4 # default is 500/4, but It might have good point for server. - if len(pages) > limit: # separate export pages for bulk-retrieve @@ -5681,7 +5682,7 @@ 'move', 'import', 'patrol', 'merge', 'suppress', 'review', 'stable', 'gblblock', 'renameuser', 'globalauth', 'gblrights', 'abusefilter', 'newusers'): - raise NotImplementedError + raise NotImplementedError, mode params = { 'action' : 'query', 'list' : 'logevents', @@ -5691,7 +5692,7 @@ if number > config.special_page_limit: params['lelimit'] = config.special_page_limit - if number > 5000 and self.site().isAllowed('apihighlimits'): + if number > 5000 and self.isAllowed('apihighlimits'): params['lelimit'] = 5000 if user: params['leuser'] = user

1 0

SVN: [8018] branches/rewrite/scripts/solve_disambiguation.py
by xqt＠svn.wikimedia.org 17 Mar '10

17 Mar '10

Revision: 8018 Author: xqt Date: 2010-03-17 07:00:43 +0000 (Wed, 17 Mar 2010) Log Message: ----------- update solve_disambiguation.py from trunk version Modified Paths: -------------- branches/rewrite/scripts/solve_disambiguation.py Modified: branches/rewrite/scripts/solve_disambiguation.py =================================================================== --- branches/rewrite/scripts/solve_disambiguation.py 2010-03-17 06:42:37 UTC (rev 8017) +++ branches/rewrite/scripts/solve_disambiguation.py 2010-03-17 07:00:43 UTC (rev 8018) @@ -266,30 +266,55 @@ u'Wikipedia:Links til sider med flertydige titler' ], 'de': [ + u'.+/[aA]rchiv.*', + u'.+/Baustelle.*', + u'.+/Index', + u'.+/Spielwiese', + u'.+/[tT]est.*', + u'.*Diskussion:.+', + u'Benutzer:.+/[Ll]og.*', + u'Benutzer:C.Löser/.+', u'Benutzer:Katharina/Begriffsklärungen', u'Benutzer:Kirschblut/.+buchstabenkürzel', + u'Benutzer:Mathias Schindler/.+', u'Benutzer:Noisper/Dingliste/[A-Z]', + u'Benutzer:Professor Einstein.*', + u'Benutzer:Sebbot/.+', u'Benutzer:SirJective/.+', - u'Benutzer:SrbBot/Index/.+', - u'Benutzer Diskussion:.+', - u'GISLexikon \([A-Z]\)', + u'Benutzer:Srbauer.*', + u'Benutzer:SteEis.', + u'Benutzer:Steindy.*', + u'Benutzer:SrbBot.*', + u'Benutzer:PortalBot/.+', + u'Benutzer:Xqbot/.+', u'Lehnwort', u'Liste griechischer Wortstämme in deutschen Fremdwörtern', u'Liste von Gräzismen', u'Portal:Abkürzungen/.+', + u'Portal:Astronomie/Moves', + u'Portal:Astronomie/Index/.+', + u'Portal:Hund', + u'Portal:Hund/Beobachtungsliste', + u'Portal:Marxismus', + u'Portal:Täuferbewegung/Seitenindex', + u'Wikipedia:Administratoren/Anfragen', u'Wikipedia:Archiv/.+', u'Wikipedia:Artikelwünsche/Ding-Liste/[A-Z]', u'Wikipedia:Begriffsklärung.*', - u'Wikipedia:Dreibuchstabenkürzel von [A-Z][A-Z][A-Z] bis [A-Z][A-Z][A-Z]', + u'Wikipedia:Bots/.+', u'Wikipedia:Interwiki-Konflikte', + u'Wikipedia:ISBN-Suche', u'Wikipedia:Liste mathematischer Themen/BKS', u'Wikipedia:Liste mathematischer Themen/Redirects', + u'Wikipedia:Meinungsbilder/.+', u'Wikipedia:Löschkandidaten/.+', - u'Wikipedia:Qualitätsoffensive/UNO', #requested by Benutzer:Addicted u'Wikipedia:WikiProjekt Altertumswissenschaft/.+', u'Wikipedia:WikiProjekt Verwaiste Seiten/Begriffsklärungen', + u'Wikipedia:Qualitätssicherung/.+', + u'Vorlage:Infobox Weltraum', + u'Vorlage:Navigationsleiste Raumfahrt', ], - 'en': [ + 'en': [ u'Wikipedia:Links to disambiguating pages', u'Wikipedia:Disambiguation pages with links', u'Wikipedia:Multiple-place names \([A-Z]\)', @@ -588,15 +613,15 @@ linktrail = self.mysite.linktrail() self.trailR = re.compile(linktrail) # The regular expression which finds links. Results consist of four - # groups: + # groups: # group title is the target page title, that is, everything before - # | or ]. + # | or ]. # group section is the page section. It'll include the # to make life - # easier for us. + # easier for us. # group label is the alternative link title, that's everything - # between | and ]. + # between | and ]. # group linktrail is the link trail, that's letters after ]] which - # are part of the word. + # are part of the word. # note that the definition of 'letter' varies from language to language. self.linkR = re.compile(r''' \[\[ (?P<title> [^\[\]\|#]*) @@ -720,26 +745,25 @@ u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % refPage.title()) - # at the beginning of the link, start red color. - # at the end of the link, reset the color to default - pywikibot.output(text[max(0, m.start() - context) - : m.start()] - + '\03{lightred}' - + text[m.start() : m.end()] - + '\03{default}' - + text[m.end() : m.end() + context]) - if not self.always: + # at the beginning of the link, start red color. + # at the end of the link, reset the color to default + pywikibot.output(text[max(0, m.start() - context) + : m.start()] + + '\03{lightred}' + + text[m.start() : m.end()] + + '\03{default}' + + text[m.end() : m.end() + context]) if edited: choice = pywikibot.input( -u"Option (#, r#, s=skip link, e=edit page, n=next page, u=unlink, q=quit,\n" +u"Option (#, r#, [s]kip link, [e]dit page, [n]ext page, [u]nlink, [q]uit,\n" u" ?=tag with " + dn_template_str + ",\n" -u" m=more context, l=list, a=add new, x=save in this form):") +u" [m]ore context, [l]ist, [a]dd new, x=save in this form):") else: choice = pywikibot.input( -u"Option (#, r#, s=skip link, e=edit page, n=next page, u=unlink, q=quit,\n" +u"Option (#, r#, [s]kip link, [e]dit page, [n]ext page, [u]nlink, [q]uit,\n" u" ?=tag with " + dn_template_str + ",\n" -u" m=more context, d=show disambiguation page, l=list, a=add new):") +u" [m]ore context, show [d]isambiguation page, [l]ist, [a]dd new):") else: choice = self.always if choice in ['a', 'A']: @@ -933,9 +957,9 @@ links = [correctcap(l,disambPage2.get()) for l in links] except pywikibot.NoPage: pywikibot.output(u"No page at %s, using redirect target." - % disambTitle) + % disambTitle) links = disambPage.linkedPages()[:1] - links = [correctcap(l,disambPage.get(get_redirect = True)) + links = [correctcap(l, disambPage.get(get_redirect = True)) for l in links] self.alternatives += links else:

1 0

SVN: [8017] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 17 Mar '10

17 Mar '10

Revision: 8017 Author: xqt Date: 2010-03-17 06:42:37 +0000 (Wed, 17 Mar 2010) Log Message: ----------- revert r8011: sometimes _GetAll() via API does not found any revisions Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-03-16 20:01:58 UTC (rev 8016) +++ trunk/pywikipedia/wikipedia.py 2010-03-17 06:42:37 UTC (rev 8017) @@ -3663,8 +3663,12 @@ def run(self): if self.pages: + doAPI = None + # API Implemented Check + # doAPI = self.site.has_api() + # Sometimes query does not contains revisions - if self.site.has_api(): + if doAPI: while True: try: data = self.getDataApi() @@ -4021,8 +4025,8 @@ # TODO: why isn't this a Site method? pages = list(pages) # if pages is an iterator, we need to make it a list output(u'Getting %d pages from %s' % (len(pages), site), newline=False) - if site.has_api(): - output(u' via API', newline=False) + #if site.has_api(): + # output(u' via API', newline=False) output(u'...') limit = config.special_page_limit / 4 # default is 500/4, but It might have good point for server.

1 0

SVN: [8016] branches/rewrite/README
by valhallasw＠svn.wikimedia.org 16 Mar '10

16 Mar '10

Revision: 8016 Author: valhallasw Date: 2010-03-16 20:01:58 +0000 (Tue, 16 Mar 2010) Log Message: ----------- And one for the rewrite branch Added Paths: ----------- branches/rewrite/README Added: branches/rewrite/README =================================================================== --- branches/rewrite/README (rev 0) +++ branches/rewrite/README 2010-03-16 20:01:58 UTC (rev 8016) @@ -0,0 +1 @@ +This is the rewrite of the Python Wikipedia Robot Framework. It features several improvements, such as full API usage and a pythonic package layout.

1 0

SVN: [8014] branches/rewrite/pywikibot/site.py
by russblau＠svn.wikimedia.org 16 Mar '10

16 Mar '10

Revision: 8014 Author: russblau Date: 2010-03-16 16:56:57 +0000 (Tue, 16 Mar 2010) Log Message: ----------- too verbose for my taste Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2010-03-16 15:22:39 UTC (rev 8013) +++ branches/rewrite/pywikibot/site.py 2010-03-16 16:56:57 UTC (rev 8014) @@ -133,7 +133,7 @@ if not hasattr(self, "_throttle"): self._throttle = Throttle(self, multiplydelay=True, - verbosedelay=True) + verbosedelay=False) return self._throttle @property

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn March 2010