Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/checkpoint-restore/criu.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNicolas Viennot <Nicolas.Viennot@twosigma.com>2019-12-19 02:32:32 +0300
committerAndrei Vagin <avagin@gmail.com>2020-02-04 23:39:05 +0300
commit2e656222d78fecc1bf6490bed59078083bdb4351 (patch)
tree2ca104d836f4e349a5105c953742923691632998 /lib
parent4c46cbc4d86c7578b98e64b8f664cf9c0b0fe978 (diff)
crit: fix python3 encoding issues
Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/py/images/images.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index f4517d845..3eedfca69 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -244,7 +244,7 @@ class ghost_file_handler:
while True:
gc = pb.ghost_chunk_entry()
buf = f.read(4)
- if buf == '':
+ if len(buf) == 0:
break
size, = struct.unpack('i', buf)
gc.ParseFromString(f.read(size))
@@ -252,13 +252,13 @@ class ghost_file_handler:
if no_payload:
f.seek(gc.len, os.SEEK_CUR)
else:
- entry['extra'] = base64.encodebytes(f.read(gc.len))
+ entry['extra'] = base64.encodebytes(f.read(gc.len)).decode('utf-8')
entries.append(entry)
else:
if no_payload:
f.seek(0, os.SEEK_END)
else:
- g_entry['extra'] = base64.encodebytes(f.read())
+ g_entry['extra'] = base64.encodebytes(f.read()).decode('utf-8')
entries.append(g_entry)
return entries