From 79273deb23303d0c0fa6d2ba90c9ae008db30a05 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Mon, 29 Apr 2013 20:25:05 +0200 Subject: [PATCH] Correct output encoding. --- dosagelib/output.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dosagelib/output.py b/dosagelib/output.py index 0e5f7da20..43ff996f2 100644 --- a/dosagelib/output.py +++ b/dosagelib/output.py @@ -6,6 +6,7 @@ import sys import os import threading import traceback +import codecs from .ansicolor import Colorizer lock = threading.Lock() @@ -13,15 +14,23 @@ lock = threading.Lock() class Output(object): """Print output with context, indentation and optional timestamps.""" - def __init__(self, stream=sys.stdout): + def __init__(self, stream=sys.stdout, encoding=None): """Initialize context and indentation.""" self.context = u'' self.level = 0 self.timestamps = False + if encoding is None: + if hasattr(stream, "encoding") and stream.encoding: + self.encoding = stream.encoding + else: + self.encoding = 'utf-8' + else: + self.encoding = encoding self.setStream(stream) def setStream(self, stream): """Initialize context and indentation.""" + stream = codecs.getwriter(self.encoding)(stream) self.stream = Colorizer(stream) def info(self, s, level=0):