From efa6ae353a6c0991d83b3662f2d2af1767bba4dd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 11 Apr 2019 15:10:05 +0530
Subject: [PATCH] py3: Fix colored output for console logger not working

---
 src/calibre/utils/logging.py  |  2 +-
 src/calibre/utils/terminal.py | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/calibre/utils/logging.py b/src/calibre/utils/logging.py
index 638cdceca3..102554b5c5 100644
--- a/src/calibre/utils/logging.py
+++ b/src/calibre/utils/logging.py
@@ -23,7 +23,7 @@ class Stream(object):
     def __init__(self, stream=None):
         if stream is None:
             stream = io.BytesIO()
-        self.stream = stream
+        self.stream = getattr(stream, 'buffer', stream)
         self._prints = partial(prints, safe_encode=True, file=stream)
 
     def flush(self):
diff --git a/src/calibre/utils/terminal.py b/src/calibre/utils/terminal.py
index 599d112ad3..9885602a5f 100644
--- a/src/calibre/utils/terminal.py
+++ b/src/calibre/utils/terminal.py
@@ -185,6 +185,7 @@ class Detect(object):
 class ColoredStream(Detect):
 
     def __init__(self, stream=None, fg=None, bg=None, bold=False):
+        stream = getattr(stream, 'buffer', stream)
         Detect.__init__(self, stream)
         self.fg, self.bg, self.bold = fg, bg, bold
         if self.set_console is not None:
@@ -192,16 +193,21 @@ class ColoredStream(Detect):
             if not self.bg:
                 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):
         if not self.isatty:
             return self
         if self.isansi:
             if self.bold:
-                self.stream.write(ATTRIBUTES['bold'])
+                self.cwrite(ATTRIBUTES['bold'])
             if self.bg is not None:
-                self.stream.write(BACKGROUNDS[self.bg])
+                self.cwrite(BACKGROUNDS[self.bg])
             if self.fg is not None:
-                self.stream.write(COLORS[self.fg])
+                self.cwrite(COLORS[self.fg])
         elif self.set_console is not None:
             if self.wval != 0:
                 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:
             return
         if self.isansi:
-            self.stream.write(RESET)
+            self.cwrite(RESET)
             self.stream.flush()
         elif self.set_console is not None:
             self.set_console(self.file_handle, self.default_console_text_attributes)