erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

memory(sqlite): fix encoding when loading pickled data

Browse source
This commit is contained in:
Goffi 2021-06-09 10:01:56 +02:00
commit d22bd6c96d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sat/memory/sqlite.py
View file

@ -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):