From 8cb9dc1ca14dc91c22aa971e18fbd8c1a83178d0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 1 Aug 2019 08:38:03 +0530 Subject: [PATCH] py3: Fix compilation of viewer code --- src/calibre/utils/rapydscript.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py index 32fa3f2b85..89d4c28ca7 100644 --- a/src/calibre/utils/rapydscript.py +++ b/src/calibre/utils/rapydscript.py @@ -291,9 +291,9 @@ def compile_viewer(): iconf = os.path.join(base, 'imgsrc', 'srv', 'generate.py') g = {'__file__': iconf} exec_path(iconf, g) - icons = g['merge']().encode('utf-8') + icons = g['merge']() with lopen(os.path.join(base, 'resources', 'content-server', 'reset.css'), 'rb') as f: - reset = f.read() + reset = f.read().decode('utf-8') html = '\n{icons}'.format( icons=icons, reset=reset)