From 8dfb3e95afcfe87f1e39f18f19522e06fc516373 Mon Sep 17 00:00:00 2001 From: Jean-Luc Stevens Date: Thu, 4 Nov 2021 05:43:58 -0500 Subject: [PATCH] Fixed UTF-8 decoding in Terminal widget (#2880) --- panel/widgets/terminal.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/panel/widgets/terminal.py b/panel/widgets/terminal.py index bcd8d7399f..fab4c4a487 100644 --- a/panel/widgets/terminal.py +++ b/panel/widgets/terminal.py @@ -163,13 +163,25 @@ def _reset(self): def _remove_last_line_from_string(value): return value[: value.rfind("CompletedProcess")] + def _decode_utf8_on_boundary(self, fd, max_read_bytes, max_extra_bytes=2): + "UTF-8 characters can be multi-byte so need to decode on correct boundary" + data = os.read(fd, max_read_bytes) + for _ in range(max_extra_bytes+1): + try: + return data.decode('utf-8') + except UnicodeDecodeError: + data = data + os.read(fd, 1) + raise UnicodeError('Could not find decode boundary for UTF-8') + def _forward_subprocess_output_to_terminal(self): if not self._fd: return (data_ready, _, _) = select.select([self._fd], [], [], self._timeout_sec) if not data_ready: return - output = os.read(self._fd, self._max_read_bytes).decode() + + output = self._decode_utf8_on_boundary(self._fd, self._max_read_bytes) + # If Child Process finished it will signal this by appending "CompletedProcess(...)" if "CompletedProcess" in output: self._reset()