Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Fix colored output for console logger not working

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-11 15:10:05 +05:30
parent cf0ae84e80
commit efa6ae353a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/utils/logging.py
View File

@ -23,7 +23,7 @@ class Stream(object):
def __init__(self, stream=None): def __init__(self, stream=None):
if stream is None: if stream is None:
stream = io.BytesIO() stream = io.BytesIO()
self.stream = stream self.stream = getattr(stream, 'buffer', stream)
self._prints = partial(prints, safe_encode=True, file=stream) self._prints = partial(prints, safe_encode=True, file=stream)
def flush(self): def flush(self):

14
src/calibre/utils/terminal.py
View File

@ -185,6 +185,7 @@ class Detect(object):
class ColoredStream(Detect): class ColoredStream(Detect):
def __init__(self, stream=None, fg=None, bg=None, bold=False): def __init__(self, stream=None, fg=None, bg=None, bold=False):
stream = getattr(stream, 'buffer', stream)
Detect.__init__(self, stream) Detect.__init__(self, stream)
self.fg, self.bg, self.bold = fg, bg, bold self.fg, self.bg, self.bold = fg, bg, bold
if self.set_console is not None: if self.set_console is not None:
@ -192,16 +193,21 @@ class ColoredStream(Detect):
if not self.bg: if not self.bg:
self.wval |= self.default_console_text_attributes & 0xF0 self.wval |= self.default_console_text_attributes & 0xF0
def cwrite(self, what):
if not isinstance(what, bytes):
what = what.encode('ascii')
self.stream.write(what)
def __enter__(self): def __enter__(self):
if not self.isatty: if not self.isatty:
return self return self
if self.isansi: if self.isansi:
if self.bold: if self.bold:
self.stream.write(ATTRIBUTES['bold']) self.cwrite(ATTRIBUTES['bold'])
if self.bg is not None: if self.bg is not None:
self.stream.write(BACKGROUNDS[self.bg]) self.cwrite(BACKGROUNDS[self.bg])
if self.fg is not None: if self.fg is not None:
self.stream.write(COLORS[self.fg]) self.cwrite(COLORS[self.fg])
elif self.set_console is not None: elif self.set_console is not None:
if self.wval != 0: if self.wval != 0:
self.set_console(self.file_handle, self.wval) self.set_console(self.file_handle, self.wval)
@ -213,7 +219,7 @@ class ColoredStream(Detect):
if not self.fg and not self.bg and not self.bold: if not self.fg and not self.bg and not self.bold:
return return
if self.isansi: if self.isansi:
self.stream.write(RESET) self.cwrite(RESET)
self.stream.flush() self.stream.flush()
elif self.set_console is not None: elif self.set_console is not None:
self.set_console(self.file_handle, self.default_console_text_attributes) self.set_console(self.file_handle, self.default_console_text_attributes)