From 7cb8c8930c3936d2c07b6ee50e77875ece77a28e Mon Sep 17 00:00:00 2001 From: Michel Oosterhof Date: Wed, 2 May 2018 14:40:02 +0400 Subject: [PATCH] working output for py2 and py3. Fix #738 --- bin/playlog | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/playlog b/bin/playlog index a8ed9e27..80939ff3 100755 --- a/bin/playlog +++ b/bin/playlog @@ -15,6 +15,11 @@ def playlog(fd, settings): color = None + if sys.version_info >= (3,): + stdout = sys.stdout.buffer + else: + stdout = sys.stdout + while 1: try: (op, tty, length, dir, sec, usec) = \ @@ -52,10 +57,10 @@ def playlog(fd, settings): time.sleep(sleeptime) prevtime = curtime if settings['colorify'] and color: - sys.stdout.write(color) - sys.stdout.write(data.decode('UTF-8')) + stdout.write(color) + stdout.write(data) if settings['colorify'] and color: - sys.stdout.write('\033[0m') + stdout.write('\033[0m') color = None sys.stdout.flush() elif str(tty) == str(currtty) and op == OP_CLOSE: