From 61d543e6c71df4e8b5895ea7d42746f04c5b77be Mon Sep 17 00:00:00 2001 From: Sven Sager Date: Thu, 3 Jun 2021 21:14:18 +0200 Subject: [PATCH] Fix error on decoding broken log files --- revpicommander/debugios.py | 1 - revpicommander/revpilogfile.py | 4 ++-- setup.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/revpicommander/debugios.py b/revpicommander/debugios.py index 944b355..d3b2f1e 100644 --- a/revpicommander/debugios.py +++ b/revpicommander/debugios.py @@ -340,7 +340,6 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios): :param value: New value as bytes or bool for widget :param just_last_value: Just set last value property """ - # child = self.findChild(self.search_class, io_name) child = self.__qwa[io_name] if child.property("frm"): value = struct.unpack(child.property("frm"), value)[0] diff --git a/revpicommander/revpilogfile.py b/revpicommander/revpilogfile.py index d45bbe7..789278f 100644 --- a/revpicommander/revpilogfile.py +++ b/revpicommander/revpilogfile.py @@ -44,7 +44,7 @@ class DataThread(QtCore.QThread): :return: tuple(position: int, EOF: bool) """ # Load max data from start position - buff_log = xmlcall(start_position, self.max_block).data + buff_log = xmlcall(start_position, self.max_block).data # type: bytes eof = True if buff_log == b'\x16': # 'ESC' @@ -59,7 +59,7 @@ class DataThread(QtCore.QThread): elif buff_log: start_position += len(buff_log) eof = len(buff_log) < self.max_block - self.line_logged.emit(log_type, True, buff_log.decode("utf-8")) + self.line_logged.emit(log_type, True, buff_log.decode("utf-8", errors="replace")) return start_position, eof diff --git a/setup.py b/setup.py index f598ec3..a8ba0fb 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ class MyEggInfo(distutils.command.install_egg_info.install_egg_info): setup( - version="0.9.2", + version="0.9.2a", python_requires="~=3.4", requires=["PyQt5", "revpimodio2", "zeroconf"],