pywikibot August 2007

pywikibot@lists.wikimedia.org

26 participants
318 discussions

[Pywikipedia-l] SVN: [4023] trunk/pywikipedia

by btongminh＠svn.wikimedia.org

Revision: 4023 Author: btongminh Date: 2007-08-09 20:51:47 +0000 (Thu, 09 Aug 2007) Log Message: ----------- Make the replacer site independent and rename it. Modified Paths: -------------- trunk/pywikipedia/delinker.txt Added Paths: ----------- trunk/pywikipedia/image_replacer.py Removed Paths: ------------- trunk/pywikipedia/replacer.py Modified: trunk/pywikipedia/delinker.txt =================================================================== --- trunk/pywikipedia/delinker.txt 2007-08-09 19:13:07 UTC (rev 4022) +++ trunk/pywikipedia/delinker.txt 2007-08-09 20:51:47 UTC (rev 4023) @@ -104,6 +104,8 @@ give the bot commands. * ''clean_list = False'': Auto clean the list. Only use this if the bot actually has edit permissions to the list. +* ''disallowed_replacements = [(r'\.png$', r'\.svg$')]'': List of regular expressions + of refused replacements. ==== SQL settings ==== * ''sql_engine = "mysql"'': Database engine to use. Currently supported: @@ -208,6 +210,7 @@ # Auto clean the list. Only use this if the bot actually # has edit permissions to the list. CommonsDelinker['clean_list'] = False +CommonsDelinker['disallowed_replacements'] = [(r'\.png$', r'\.svg$')] ## SQL connection information. # Database engine to use. Currently supported: MySQL, sqlite3. Copied: trunk/pywikipedia/image_replacer.py (from rev 4022, trunk/pywikipedia/replacer.py) =================================================================== --- trunk/pywikipedia/image_replacer.py (rev 0) +++ trunk/pywikipedia/image_replacer.py 2007-08-09 20:51:47 UTC (rev 4023) @@ -0,0 +1,133 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Please refer to delinker.txt for full documentation. +""" +# +# +# (C) Bryan Tong Minh, 2007 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +import config, wikipedia +import re, time + +from delinker import wait_callback, output, connect_database + +def mw_timestamp(ts): + return '%s%s%s%s-%s%s-%s%sT%s%s:%s%s:%s%sZ' % tuple(ts) +DB_TS = re.compile('[^0-9]') +def db_timestamp(ts): + return DB_TS.sub('', ts) +IMG_NS = re.compile(r'(?i)^\s*Image\:') +def strip_image(img): + img = IMG_NS.sub('', img) + img = img.replace(' ', '_') + img = img[0].upper() + img[1:] + return img.strip() + +class Replacer(object): + def __init__(self): + self.config = config.CommonsDelinker + self.config.update(getattr(config, 'Replacer', ())) + self.template = re.compile(r'\{\{%s\|([^|]*?)\|([^|]*?)(?:(?:\|reason\=(.*?))?)\}\}' % \ + self.config['replace_template']) + self.disallowed_replacements = [(re.compile(i[0]), re.compile(i[1])) + for i in self.config.get('disallowed_replacements', ())] + + self.site = wikipedia.getSite() + + self.database = connect_database() + self.cursor = self.database.cursor() + + def read_replace_log(self): + # FIXME: Make sqlite3 compatible + insert = """INSERT INTO %s (timestamp, old_image, new_image, + status, user, comment) VALUES (%%s, %%s, %%s, + 'pending', %%s, %%s)""" % self.config['replacer_table'] + + page = wikipedia.Page(self.site, self.config['command_page']) + + # Get last revision date + if self.cursor.execute("""SELECT timestamp FROM %s + ORDER BY timestamp DESC LIMIT 1""" % \ + self.config['replacer_table']): + since = mw_timestamp(self.cursor.fetchone()[0]) + else: + since = None + + try: + revisions = page.fullVersionHistory(max = 500, since = since) + # Fetch the page any way, to prevent editconflicts + old_text = text = page.get() + except StandardError, e: + # Network error, not critical + output(u'Warning! Unable to read replacement log.', False) + output('%s: %s' % (e.__class__.__name__, str(e)), False) + return time.sleep(self.config['timeout']) + + revisions.sort(key = lambda rev: rev[0]) + replacements = self.template.finditer(text) + + if self.config.get('clean_list', False): + username = config.sysopnames[self.site.family.name][self.site.lang] + else: + username = None + + for replacement in replacements: + res = self.examine_revision_history( + revisions, replacement, username) + if res and self.allowed_replacement(replacement): + self.cursor.execute(insert, res) + text = text.replace(replacement.group(0), '') + output('Replacing %s by %s: %s' % replacement.groups()) + self.database.commit() + + if text != old_text and self.config.get('clean_list', False): + page.put(text.strip(), comment = 'Removing images being processed') + + def examine_revision_history(self, revisions, replacement, username): + if replacement.group(0) in revisions[0][2]: + return (db_timestamp(revisions[0][0]), + strip_image(replacement.group(1)), + strip_image(replacement.group(2)), + '<Unknown>', replacement.group(3)) + + for timestamp, user, text in revisions[1:]: + if replacement.group(0) in text and user != username: + return (db_timestamp(timestamp), + strip_image(replacement.group(1)), + strip_image(replacement.group(2)), + user, replacement.group(3)) + + output('Warning! Could not find out who did %s' % \ + repr(replacement.group(0)), False) + return + + def start(self): + while True: + self.read_replace_log() + # Replacer should not loop as often as delinker + time.sleep(self.config['timeout'] * 2) + + def allowed_replacement(self, replacement): + for source, target in self.disallowed_replacements: + if source.search(replacement.group(1)) and \ + target.search(replacement.group(2)): + return False + return True + +if __name__ == '__main__': + import sys, cgitb + try: + # FIXME: Add support for single-process replacer. + r = Replacer() + r.start() + except StandardError, e: + if type(e) not in (SystemExit, KeyboardInterrupt): + output('A critical error has occured! Aborting!') + print >>sys.stderr, cgitb.text(sys.exc_info()) + except: + pass + wikipedia.stopme() \ No newline at end of file Deleted: trunk/pywikipedia/replacer.py =================================================================== --- trunk/pywikipedia/replacer.py 2007-08-09 19:13:07 UTC (rev 4022) +++ trunk/pywikipedia/replacer.py 2007-08-09 20:51:47 UTC (rev 4023) @@ -1,119 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -""" -Please refer to delinker.txt for full documentation. -""" -# -# -# (C) Bryan Tong Minh, 2007 -# -# Distributed under the terms of the MIT license. -# -__version__ = '$Id$' -import config, wikipedia -import re, time - -from delinker import wait_callback, output, connect_database - -def mw_timestamp(ts): - return '%s%s%s%s-%s%s-%s%sT%s%s:%s%s:%s%sZ' % tuple(ts) -DB_TS = re.compile('[^0-9]') -def db_timestamp(ts): - return DB_TS.sub('', ts) -IMG_NS = re.compile(r'(?i)^\s*Image\:') -def strip_image(img): - img = IMG_NS.sub('', img) - img = img.replace(' ', '_') - img = img[0].upper() + img[1:] - return img.strip() - -class Replacer(object): - def __init__(self): - self.config = config.CommonsDelinker - self.config.update(getattr(config, 'Replacer', ())) - self.template = re.compile(r'\{\{%s\|([^|]*?)\|([^|]*?)(?:(?:\|reason\=(.*?))?)\}\}' % \ - self.config['template']) - self.site = wikipedia.getSite() - - self.database = connect_database() - self.cursor = self.database.cursor() - - def read_replace_log(self): - # FIXME: Make sqlite3 compatible - insert = """INSERT INTO %s (timestamp, old_image, new_image, - status, user, comment) VALUES (%%s, %%s, %%s, - 'pending', %%s, %%s)""" % self.config['replacer_table'] - - page = wikipedia.Page(self.site, self.config['command_page']) - - # Get last revision date - if self.cursor.execute("""SELECT timestamp FROM %s - ORDER BY timestamp DESC LIMIT 1""" % \ - self.config['replacer_table']): - since = mw_timestamp(self.cursor.fetchone()[0]) - else: - since = None - - try: - revisions = page.fullVersionHistory(max = 500, since = since) - # Fetch the page any way, to prevent editconflicts - old_text = text = page.get() - except StandardError, e: - # Network error, not critical - output(u'Warning! Unable to read replacement log.', False) - output('%s: %s' % (e.__class__.__name__, str(e)), False) - return time.sleep(self.config['timeout']) - - revisions.sort(key = lambda rev: rev[0]) - replacements = self.template.finditer(text) - - for replacement in replacements: - res = self.examine_revision_history( - revisions, replacement, - config.sysopnames['commons']['commons']) - if res: - self.cursor.execute(insert, res) - text = text.replace(replacement.group(0), '') - output('Replacing %s by %s: %s' % replacement.groups()) - self.database.commit() - - if text != old_text and self.config.get('clean_list', False): - page.put(text.strip(), comment = 'Removing images being processed') - - def examine_revision_history(self, revisions, replacement, username): - if replacement.group(0) in revisions[0][2]: - return (db_timestamp(revisions[0][0]), - strip_image(replacement.group(1)), - strip_image(replacement.group(2)), - '<Unknown>', replacement.group(3)) - - for timestamp, user, text in revisions[1:]: - if replacement.group(0) in text and user != username: - return (db_timestamp(timestamp), - strip_image(replacement.group(1)), - strip_image(replacement.group(2)), - user, replacement.group(3)) - - output('Warning! Could not find out who did %s' % \ - repr(replacement.group(0)), False) - return - - def start(self): - while True: - self.read_replace_log() - # Replacer should not loop as often as delinker - time.sleep(self.config['timeout'] * 2) - -if __name__ == '__main__': - import sys, cgitb - try: - # FIXME: Add support for single-process replacer. - r = Replacer() - r.start() - except StandardError, e: - if type(e) not in (SystemExit, KeyboardInterrupt): - output('A critical error has occured! Aborting!') - print >>sys.stderr, cgitb.text(sys.exc_info()) - except: - pass - wikipedia.stopme() \ No newline at end of file

16 years, 8 months

[Pywikipedia-l] SVN: [4022] trunk/pywikipedia/delinker.py

by btongminh＠svn.wikimedia.org

Revision: 4022 Author: btongminh Date: 2007-08-09 19:13:07 +0000 (Thu, 09 Aug 2007) Log Message: ----------- Add bug section; Fix bug that changes replace into delete; Flush the standard streams on exit; Modified Paths: -------------- trunk/pywikipedia/delinker.py Modified: trunk/pywikipedia/delinker.py =================================================================== --- trunk/pywikipedia/delinker.py 2007-08-09 17:33:37 UTC (rev 4021) +++ trunk/pywikipedia/delinker.py 2007-08-09 19:13:07 UTC (rev 4022) @@ -29,6 +29,10 @@ # TODO: # * Don't replace within <nowiki /> tags # * Make as many config settings site dependend +# BUGS: +# * There is a problem with images in the es.wikisource project namespace. +# The exact problem is described somewhere in Bryan's IRC logs, but it is +# unknown where exactly. import sys, os, threading, time import traceback @@ -130,7 +134,7 @@ if skipped_images: time.sleep(self.CommonsDelinker.config['timeout']) - return self.delink_image(image, skipped_images, timestamp, admin, reason) + return self.delink_image(image, skipped_images, timestamp, admin, reason, replacement) elif replacement: # Let them know that we are done replacing. self.CommonsDelinker.Loggers.append((timestamp, image, replacement)) @@ -793,3 +797,6 @@ finally: output(u'Stopping CommonsDelinker') wikipedia.stopme() + # Flush the standard streams + sys.stdout.flush() + sys.stderr.flush()

16 years, 8 months

[Pywikipedia-l] SVN: [4021] trunk/pywikipedia/delinker.txt

by btongminh＠svn.wikimedia.org

Revision: 4021 Author: btongminh Date: 2007-08-09 17:33:37 +0000 (Thu, 09 Aug 2007) Log Message: ----------- Grammar fixes Modified Paths: -------------- trunk/pywikipedia/delinker.txt Modified: trunk/pywikipedia/delinker.txt =================================================================== --- trunk/pywikipedia/delinker.txt 2007-08-09 16:14:13 UTC (rev 4020) +++ trunk/pywikipedia/delinker.txt 2007-08-09 17:33:37 UTC (rev 4021) @@ -60,7 +60,7 @@ family. Also setup the usernames[][] variables. === Delinker variables === -Due to history reasons, the configuration variable is called ''CommonsDelinker''. +Due to historical reasons, the configuration variable is called ''CommonsDelinker''. First setup the dictionary ''CommonsDelinker'', by adding to the config: CommonsDelinker = {} @@ -84,7 +84,7 @@ [[:Image:$2]] by administrator [[User:$3]]: ''$4''."'' }: Default settings, in case no on-wiki settings are found. For the meaning of the variables, please refer to [[m:User:CommonsDelinker]]. -* ''global = False'': Set global or local delink. DO NOT RUN THIS BOT ON +* ''global = False'': Set global or local delink. DO NOT RUN THIS BOT GLOBALLY WITHOUT CONSULTING BRYAN AND SIEBRAND. Thank you. * ''no_sysop = True'': Disable delinking as sysop. @@ -96,6 +96,8 @@ summary, the file is not delinked. * ''summary_cache = 3600'': Time before on-wiki settings are updated. +==== Replacer settings ==== +Those variables only need to be set if the replacer is enabled. * ''replace_template = "replace image"'': The template for to command replacement. * ''command_page = "User:CommonsDelinker/commands"'': The page were sysops can

16 years, 8 months

[Pywikipedia-l] [ pywikipediabot-Bugs-1757382 ] edit conflit undetected

by SourceForge.net

Bugs item #1757382, was opened at 2007-07-20 10:44 Message generated for change (Comment added) made by btongminh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1757382&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: interwiki Group: None Status: Closed Resolution: Fixed Priority: 5 Private: No Submitted By: DarkoNeko (darkoneko) Assigned to: Nobody/Anonymous (nobody) Summary: edit conflit undetected Initial Comment: I'm using the freshest version of pywikipediabot (it's certain, as I had to reinstall everything from CVS since my HD crashed a few days ago) the problem is this diff : http://es.wikipedia.org/w/index.php?title=6_de_febrero&diff=prev&oldid=1012… the diff taken in account is in fact the previous version, http://es.wikipedia.org/w/index.php?title=6_de_febrero&diff=prev&oldid=1012… the time lag of 1hour can be explained by the fact the date page took forever to be analysed, or maybe there was a big bunch of "waiting 5 second because of server lag" too, between the moment it took the page and the moment it wrote it. But the script didn't detect a change was made to the page in the meanwhile. ---------------------------------------------------------------------- Comment By: Bryan (btongminh) Date: 2007-08-09 18:45 Message: Logged In: YES user_id=1806226 Originator: NO This fix by Andre Engels causes my bot to always raise an edit conflict on [[:commons:User:CommonsDelinker/commands]]. If I recall correctly, the sand box solution gave you an edit token from your normal username, and not from your sysopname, but I'll check next time before I commit. ---------------------------------------------------------------------- Comment By: SourceForge Robot (sf-robot) Date: 2007-08-09 04:20 Message: Logged In: YES user_id=1312539 Originator: NO This Tracker item was closed automatically by the system. It was previously set to a Pending status, and the original submitter did not respond within 14 days (the time period specified by the administrator of this Tracker). ---------------------------------------------------------------------- Comment By: Daniel Herding (wikipedian) Date: 2007-07-25 23:37 Message: Logged In: YES user_id=880694 Originator: NO I tracked this issue and I think it is now fixed in SVN. Please update immediately, and please help testing this solution. Here is my SVN commit message: Andre Engels did it properly in wikipedia.py CVS r1.927 (SVN r3710) with the description "Avoid 'solving' edit conflicts by throwing away the conflicting edit." Bryan broke it in wikipedia.py CVS r1.950 (SVN r3837) with the description "Undo the change in r1.927 to get a token of the page itself instead of the sandbox, to prevent edit conflicts when editting as sysop." I basically reverted it to Andre's version. I didn't test if unwanted edit conflicts are raised when someone edits the sandbox. But even if that's the case, having an edit conflict here and there is better than the catastrophic situation that we have at the moment (bots overwrite other user's changes). ---------------------------------------------------------------------- Comment By: Byrial Ole Jensen (byrial) Date: 2007-07-23 23:21 Message: Logged In: YES user_id=23252 Originator: NO A new fresh example: http://en.wikipedia.org/w/index.php?title=2007_FIFA_U-20_World_Cup&diff=pre… - that edit from 20:29 undid 8 versions made in the previous hour from 19:29 to 20:24. ---------------------------------------------------------------------- Comment By: Byrial Ole Jensen (byrial) Date: 2007-07-20 20:28 Message: Logged In: YES user_id=23252 Originator: NO I was about to make a similar bug report. Instead I can now give two more examples of undetected edit conflicts: - http://en.wikipedia.org/w/index.php?title=November_7&diff=144478910&oldid=1… - http://no.wikipedia.org/w/index.php?title=%C3%85rsta_holmar&diff=2437723&ol… ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1757382&group_…

16 years, 8 months

[Pywikipedia-l] [ pywikipediabot-Bugs-1770747 ] initialisation error

by SourceForge.net

Bugs item #1770747, was opened at 2007-08-09 14:06 Message generated for change (Comment added) made by misza13 You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1770747&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None >Status: Closed Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: initialisation error Initial Comment: My bot fails right at the first LOC import pagegenerators, wikipedia with File "script.py", line 14, in ? import pagegenerators, wikipedia File "pagegenerators.py", line 85, in ? import wikipedia, date, catlib File "wikipedia.py", line 4217, in ? getSite() File "wikipedia.py", line 4128, in getSite _sites[key] = Site(code=code, fam=fam, user=user) File "wikipedia.py", line 3101, in __init__ if not language[0].upper() + language[1:] in self.namespaces(): IndexError: string index out of range Used to work earlier. ---------------------------------------------------------------------- >Comment By: Misza13 (misza13) Date: 2007-08-09 18:15 Message: Logged In: YES user_id=1686644 Originator: NO Fixed in r4020 - 'wikisource.org' will now use '-' as the language key. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2007-08-09 15:11 Message: Logged In: NO my user-config.py: mylang = 'en' family = 'wikisource' usernames['wikisource']['en'] = 'TalBot' sysopnames['wikisource']['en'] = 'TalBot' console_encoding = 'utf-8' ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2007-08-09 15:10 Message: Logged In: NO I believe the change --- trunk/pywikipedia/families/wikisource_family.py 2007/07/25 11:56:14 3896 +++ trunk/pywikipedia/families/wikisource_family.py 2007/08/07 19:44:17 3994 @@ -11,6 +11,7 @@ self.name = 'wikisource' self.langs = { + '':'wikisource.org', 'dk':'da.wikisource.org', 'jp':'ja.wikisource.org', 'minnan':'zh-min-nan.wikisource.org', from revision 3994 to wikisource_family.py is the culprit: the added language has the empty string as key. ---------------------------------------------------------------------- Comment By: Merlijn S. van Deen (valhallasw) Date: 2007-08-09 14:12 Message: Logged In: YES user_id=687283 Originator: NO Please post your user-config.py ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1770747&group_…

16 years, 8 months

[Pywikipedia-l] SVN: [4020] trunk/pywikipedia/families/wikisource_family.py

by misza13＠svn.wikimedia.org

Revision: 4020 Author: misza13 Date: 2007-08-09 16:14:13 +0000 (Thu, 09 Aug 2007) Log Message: ----------- Fix bug #1770747 - main wikisource.org wiki (no domain prefix) will use '-' as language key. Modified Paths: -------------- trunk/pywikipedia/families/wikisource_family.py Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2007-08-09 14:44:51 UTC (rev 4019) +++ trunk/pywikipedia/families/wikisource_family.py 2007-08-09 16:14:13 UTC (rev 4020) @@ -11,7 +11,7 @@ self.name = 'wikisource' self.langs = { - '':'wikisource.org', + '-':'wikisource.org', 'dk':'da.wikisource.org', 'jp':'ja.wikisource.org', 'minnan':'zh-min-nan.wikisource.org',

16 years, 8 months

[Pywikipedia-l] SVN: [4019] trunk/pywikipedia

by wikipedian＠svn.wikimedia.org

Revision: 4019 Author: wikipedian Date: 2007-08-09 14:44:51 +0000 (Thu, 09 Aug 2007) Log Message: ----------- fixed logging behavior of newlines Modified Paths: -------------- trunk/pywikipedia/userinterfaces/cgi_interface.py trunk/pywikipedia/userinterfaces/terminal_interface.py trunk/pywikipedia/userinterfaces/tkinter_interface.py trunk/pywikipedia/userinterfaces/wxpython_interface.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/userinterfaces/cgi_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/cgi_interface.py 2007-08-09 14:35:37 UTC (rev 4018) +++ trunk/pywikipedia/userinterfaces/cgi_interface.py 2007-08-09 14:44:51 UTC (rev 4019) @@ -4,7 +4,7 @@ def __init__(self): pass - def output(self, text, newline = True, toStdout = False): + def output(self, text, toStdout = False): # all debug output etc. will be ignored. if toStdout: sys.stdout.write(text.encode('UTF-8', 'replace')) Modified: trunk/pywikipedia/userinterfaces/terminal_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-08-09 14:35:37 UTC (rev 4018) +++ trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-08-09 14:44:51 UTC (rev 4019) @@ -1,4 +1,4 @@ - + __version__ = '$Id$' import config, transliteration @@ -122,7 +122,7 @@ else: targetStream.write(text.encode(config.console_encoding, 'replace')) - def output(self, text, newline = True, toStdout = False): + def output(self, text, toStdout = False): """ If a character can't be displayed in the encoding used by the user's terminal, it will be replaced with a question mark or by a @@ -162,8 +162,6 @@ transliteratedText += codecedText[i] prev = codecedText[i] text = transliteratedText - if newline: - text += u'\n' if toStdout: targetStream = sys.stdout @@ -182,7 +180,8 @@ # sound the terminal bell to notify the user if config.ring_bell: sys.stdout.write('\07') - self.output(question + ' ', newline = False) + # TODO: make sure this is logged as well + self.output(question + ' ') if password: import getpass text = getpass.getpass('') Modified: trunk/pywikipedia/userinterfaces/tkinter_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/tkinter_interface.py 2007-08-09 14:35:37 UTC (rev 4018) +++ trunk/pywikipedia/userinterfaces/tkinter_interface.py 2007-08-09 14:44:51 UTC (rev 4019) @@ -155,7 +155,7 @@ MainloopThread(self.parent).start() - def output(self, text, urgency = 1, newline = True, toStdout = False): + def output(self, text, urgency = 1, toStdout = False): """ urgency levels: 0 - Debug output. Won't be shown in normal mode. @@ -192,8 +192,6 @@ #self.logBox.tag_add(colors[i], startidx , endidx) - if newline: - self.logBox.insert(END, '\n') # auto-scroll down self.logBox.see(END) Modified: trunk/pywikipedia/userinterfaces/wxpython_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/wxpython_interface.py 2007-08-09 14:35:37 UTC (rev 4018) +++ trunk/pywikipedia/userinterfaces/wxpython_interface.py 2007-08-09 14:44:51 UTC (rev 4019) @@ -12,16 +12,13 @@ def __init__(self): pass - def output(self, text, newline = True): + def output(self, text, ): """ If a character can't be displayed, it will be replaced with a question mark. """ - if newline: - print text.encode(config.console_encoding, 'replace') - else: - # comma at the end means "don't print newline" - print text.encode(config.console_encoding, 'replace'), + # comma at the end means "don't print newline" + print text.encode(config.console_encoding, 'replace'), def input(self, question, password = False): """ Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-08-09 14:35:37 UTC (rev 4018) +++ trunk/pywikipedia/wikipedia.py 2007-08-09 14:44:51 UTC (rev 4019) @@ -4471,7 +4471,7 @@ # TODO: consider pre-compiling this regex for speed improvements plaintext = colorTagR.sub('', text) # save the text in a logfile (will be written in utf-8) - logfile.write(plaintext + '\n') + logfile.write(plaintext) logfile.flush() @@ -4509,11 +4509,13 @@ text = unicode(text, 'utf-8') except UnicodeDecodeError: text = unicode(text, 'iso8859-1') + if newline: + text += u'\n' log(text) if input_lock.locked(): - cache_output(text, newline = newline, toStdout = toStdout) + cache_output(text, toStdout = toStdout) else: - ui.output(text, newline = newline, toStdout = toStdout) + ui.output(text, toStdout = toStdout) finally: output_lock.release()

16 years, 8 months

[Pywikipedia-l] SVN: [4018] trunk/pywikipedia/wikipedia.py

by wikipedian＠svn.wikimedia.org

Revision: 4018 Author: wikipedian Date: 2007-08-09 14:35:37 +0000 (Thu, 09 Aug 2007) Log Message: ----------- don't write color tags to logfile Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-08-09 14:16:14 UTC (rev 4017) +++ trunk/pywikipedia/wikipedia.py 2007-08-09 14:35:37 UTC (rev 4018) @@ -4460,6 +4460,22 @@ if '*' in config.log or calledModuleName() in config.log: setLogfileStatus(True) +colorTagR = re.compile('\03{.*?}', re.UNICODE) + +def log(text): + """ + Writes the given text to the logfile. + """ + if logfile: + # remove all color markup + # TODO: consider pre-compiling this regex for speed improvements + plaintext = colorTagR.sub('', text) + # save the text in a logfile (will be written in utf-8) + logfile.write(plaintext + '\n') + logfile.flush() + + + output_lock = threading.Lock() input_lock = threading.Lock() output_cache = [] @@ -4475,6 +4491,10 @@ If toStdout is True, the text will be sent to standard output, so that it can be piped to another process. All other text will be sent to stderr. See: http://en.wikipedia.org/wiki/Pipeline_%28Unix%29 + + text can contain special sequences to create colored output. These + consist of the escape character \03 and the color name in curly braces, + e. g. \03{lightpurple}. \03{default} resets the color. """ output_lock.acquire() try: @@ -4489,10 +4509,7 @@ text = unicode(text, 'utf-8') except UnicodeDecodeError: text = unicode(text, 'iso8859-1') - if logfile: - # save the text in a logfile (will be written in utf-8) - logfile.write(text + '\n') - logfile.flush() + log(text) if input_lock.locked(): cache_output(text, newline = newline, toStdout = toStdout) else:

16 years, 8 months

[Pywikipedia-l] SVN: [4017] trunk/pywikipedia/selflink.py

by wikipedian＠svn.wikimedia.org

Revision: 4017 Author: wikipedian Date: 2007-08-09 14:16:14 +0000 (Thu, 09 Aug 2007) Log Message: ----------- bugfix Modified Paths: -------------- trunk/pywikipedia/selflink.py Modified: trunk/pywikipedia/selflink.py =================================================================== --- trunk/pywikipedia/selflink.py 2007-08-09 14:11:30 UTC (rev 4016) +++ trunk/pywikipedia/selflink.py 2007-08-09 14:16:14 UTC (rev 4017) @@ -108,7 +108,7 @@ else: # at the beginning of the link, start red color. # at the end of the link, reset the color to default - wikipedia.output(text[m.start() - context : m.start()] + '\03{lightred}' + text[m.start() : m.end()] + '\03{default}' + text[m.end() : m.end() + context]) + wikipedia.output(text[match.start() - context : match.start()] + '\03{lightred}' + text[match.start() : match.end()] + '\03{default}' + text[match.end() : match.end() + context]) choice = wikipedia.inputChoice(u'\nWhat shall be done with this selflink?', ['unlink', 'make bold', 'skip', 'edit', 'more context'], ['U', 'b', 's', 'e', 'm'], 'u') wikipedia.output(u'')

16 years, 8 months

[Pywikipedia-l] SVN: [4016] trunk/pywikipedia/config.py

by wikipedian＠svn.wikimedia.org

Revision: 4016 Author: wikipedian Date: 2007-08-09 14:11:30 +0000 (Thu, 09 Aug 2007) Log Message: ----------- added instructions how to disable logging Modified Paths: -------------- trunk/pywikipedia/config.py Modified: trunk/pywikipedia/config.py =================================================================== --- trunk/pywikipedia/config.py 2007-08-09 14:10:36 UTC (rev 4015) +++ trunk/pywikipedia/config.py 2007-08-09 14:11:30 UTC (rev 4016) @@ -165,6 +165,8 @@ # log = ['interwiki', 'weblinkchecker', 'table2wiki'] # It is also possible to enable logging for all scripts, using this line: # log = ['*'] +# To disable all logging, use this: +# log = [] # Per default, logging of interwiki.py is enabled because its logfiles can # be used to generate so-called warnfiles. # This setting can be overridden by the -log or -nolog command-line arguments.

16 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot August 2007