From 585a0ac59eb6504d59e1e0ac166afce5cb66a1c8 Mon Sep 17 00:00:00 2001 From: Farhad Taebi Date: Mon, 10 Oct 2022 14:16:14 +0200 Subject: [PATCH 1/3] fix lines resulting in string-bytes comparison error --- pyxlsb/reader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyxlsb/reader.py b/pyxlsb/reader.py index d5d9772..4e69cee 100644 --- a/pyxlsb/reader.py +++ b/pyxlsb/reader.py @@ -144,7 +144,7 @@ def read_id(self): v = 0 for i in range(4): byte = self._fp.read(1) - if byte == '': + if byte == b'': return None byte = uint8_t.unpack(byte)[0] v += byte << 8 * i @@ -156,7 +156,7 @@ def read_len(self): v = 0 for i in range(4): byte = self._fp.read(1) - if byte == '': + if byte == b'': return None byte = uint8_t.unpack(byte)[0] v += (byte & 0x7F) << (7 * i) From be589c6a35caf979370c43c65b0f775dc05c69ba Mon Sep 17 00:00:00 2001 From: Farhad Taebi Date: Tue, 11 Oct 2022 10:03:15 +0200 Subject: [PATCH 2/3] Update pyxlsb/reader.py Co-authored-by: William Turner --- pyxlsb/reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyxlsb/reader.py b/pyxlsb/reader.py index 4e69cee..9c973b5 100644 --- a/pyxlsb/reader.py +++ b/pyxlsb/reader.py @@ -144,7 +144,7 @@ def read_id(self): v = 0 for i in range(4): byte = self._fp.read(1) - if byte == b'': + if not byte: return None byte = uint8_t.unpack(byte)[0] v += byte << 8 * i From a680f19dcf1d2e97b77b05cf15f61fd3579252f8 Mon Sep 17 00:00:00 2001 From: Farhad Taebi Date: Tue, 11 Oct 2022 10:18:04 +0200 Subject: [PATCH 3/3] replace all occurances of empty byte comparison by the backwards compatible version --- pyxlsb/reader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyxlsb/reader.py b/pyxlsb/reader.py index 9c973b5..de88f8f 100644 --- a/pyxlsb/reader.py +++ b/pyxlsb/reader.py @@ -47,7 +47,7 @@ def read_short(self): def read_byte(self): byte = self._fp.read(1) - if byte == b'': + if not byte: return None return uint8_t.unpack(byte)[0] @@ -156,7 +156,7 @@ def read_len(self): v = 0 for i in range(4): byte = self._fp.read(1) - if byte == b'': + if not byte: return None byte = uint8_t.unpack(byte)[0] v += (byte & 0x7F) << (7 * i)