diff options
author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-10-22 09:52:28 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-10-22 10:26:41 (GMT) |
commit | 7a327b5e48f2fbf01473015e705a0ceac2152b46 (patch) | |
tree | b0602fe5be0196b8374a3b02c054c3346a366079 /active_toolkit/printf.py | |
parent | c4635e62236dcd6087df448505f73c4fa8f1aa82 (diff) |
Update codelets
Diffstat (limited to 'active_toolkit/printf.py')
-rw-r--r-- | active_toolkit/printf.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/active_toolkit/printf.py b/active_toolkit/printf.py index 8cc9a37..c292b7e 100644 --- a/active_toolkit/printf.py +++ b/active_toolkit/printf.py @@ -17,7 +17,7 @@ $Repo: git://git.sugarlabs.org/alsroot/codelets.git$ $File: src/printf.py$ -$Date: 2012-08-16$ +$Date: 2012-10-22$ """ @@ -35,6 +35,9 @@ BOLD = '\033[1m' BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = \ ['\033[1;%dm' % (30 + i_) for i_ in range(8)] +stdout = sys.stdout +stderr = sys.stderr + _hints = [] _last_line_len = 0 _last_progress = [] @@ -50,7 +53,7 @@ def dump(message, *args): `%` arguments to expand `message` value """ - _dump(False, sys.stdout, '', [message, args], '\n') + _dump(False, stdout, '', [message, args], '\n') def info(message, *args): @@ -62,7 +65,7 @@ def info(message, *args): `%` arguments to expand `message` value """ - _dump(True, sys.stderr, None, [message, args], '\n') + _dump(True, stderr, None, [message, args], '\n') _dump_progress() @@ -103,7 +106,7 @@ def exception(message=None, *args): message += ': %s' % error else: message = str(error) - _dump(True, sys.stderr, None, message, '\n') + _dump(True, stderr, None, message, '\n') if logging.getLogger().level > logging.INFO: hint('Use -D argument for debug info, ' @@ -112,7 +115,7 @@ def exception(message=None, *args): hint('Use -DD argument for full debuging output and tracebacks') else: for i in tb_list: - _dump(True, sys.stderr, ' ', i, '\n') + _dump(True, stderr, ' ', i, '\n') _dump_progress() @@ -128,7 +131,7 @@ def scan_yn(message, *args): `True` if user's input was `Y` """ - _dump(True, sys.stderr, None, [message, args], ' [Y/N] ') + _dump(True, stderr, None, [message, args], ' [Y/N] ') answer = raw_input() _dump_progress() return answer and answer in 'Yy' @@ -153,7 +156,7 @@ def progress(message, *args): def clear_progress(): """Clear status line on program exit.""" if _last_line_len: - sys.stderr.write(chr(13) + ' ' * _last_line_len + chr(13)) + stderr.write(chr(13) + ' ' * _last_line_len + chr(13)) def hint(message, *args): @@ -179,7 +182,7 @@ def flush_hints(): if _hints: dump('') while _hints: - _dump(True, sys.stderr, '-- Hint: ', _hints.pop(0), '\n') + _dump(True, stderr, '-- Hint: ', _hints.pop(0), '\n') def _dump(is_status, stream, prefix, *args): @@ -222,5 +225,5 @@ def _dump(is_status, stream, prefix, *args): def _dump_progress(): - _dump(True, sys.stderr, ' ', _last_progress, chr(13)) - sys.stderr.flush() + _dump(True, stderr, ' ', _last_progress, chr(13)) + stderr.flush() |