From 170b438b982632f5274aa0de9e2b15300e16e25c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 27 Jan 2016 20:45:04 +0100 Subject: [PATCH] protocols/logging/LogParser: handle Windows CRLF --- artiq/protocols/logging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artiq/protocols/logging.py b/artiq/protocols/logging.py index b6ddb9bb6..693e58f7d 100644 --- a/artiq/protocols/logging.py +++ b/artiq/protocols/logging.py @@ -78,7 +78,7 @@ class LogParser: entry = (await stream.readline()) if not entry: break - self.line_input(entry[:-1].decode()) + self.line_input(entry.decode().rstrip("\r\n")) except: logger.debug("exception in log forwarding", exc_info=True) break