From d22bd6c96d9531327a8d587a368ea359d26d9b8e Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 9 Jun 2021 10:01:56 +0200 Subject: [PATCH] memory(sqlite): fix encoding when loading pickled data --- sat/memory/sqlite.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sat/memory/sqlite.py b/sat/memory/sqlite.py index e09798da..596768ff 100644 --- a/sat/memory/sqlite.py +++ b/sat/memory/sqlite.py @@ -706,12 +706,12 @@ class SqliteStorage(object): msg = failure_)) def _load_pickle(self, v): - # FIXME: workaround for Python 3 port, some pickled data are byte while other are strings + # FIXME: workaround for Python 3 port, some pickled data are bytes while other are strings try: - return pickle.loads(v) + return pickle.loads(v, encoding="utf-8") except TypeError: - data = pickle.loads(v.encode('utf-8')) - log.warning(f"encoding issue in pickled data: {data}") + data = pickle.loads(v.encode('utf-8'), encoding="utf-8") + log.debug(f"encoding issue in pickled data: {data}") return data def _generateDataDict(self, query_result, binary):