dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Fix a conflict with IPython.

Browse source
This commit is contained in:
Tobias Gruetzmacher 2016-03-20 23:55:32 +01:00
parent 2f61ecb721
commit d6db1d0b81
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dosagelib/output.py
View file

@ -1,6 +1,8 @@
# -*- coding: iso-8859-1 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
# Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2012-2014 Bastian Kleineidam
# Copyright (C) 2005-2016 Tobias Gruetzmacher
import time import time
import sys import sys
import os import os
@ -9,8 +11,10 @@ import traceback
import codecs import codecs
from .ansicolor import Colorizer from .ansicolor import Colorizer
lock = threading.Lock() lock = threading.Lock()
def get_threadname(): def get_threadname():
"""Return name of current thread.""" """Return name of current thread."""
return threading.current_thread().getName() return threading.current_thread().getName()
@ -29,7 +33,7 @@ class Output(object):
self.encoding = sys.stdout.encoding self.encoding = sys.stdout.encoding
else: else:
self.encoding = 'utf-8' self.encoding = 'utf-8'
if sys.version_info[0] >= 3: if hasattr(sys.stdout, 'buffer'):
stream = sys.stdout.buffer stream = sys.stdout.buffer
else: else:
stream = sys.stdout stream = sys.stdout
@ -55,8 +59,6 @@ class Output(object):
def error(self, s, tb=None): def error(self, s, tb=None):
"""Write an error message.""" """Write an error message."""
self.write(u"ERROR: %s" % s, color='light;red') self.write(u"ERROR: %s" % s, color='light;red')
#if tb is not None:
# self.write('Traceback (most recent call last):', 1)
def exception(self, s): def exception(self, s):
"""Write error message with traceback info.""" """Write error message with traceback info."""