From c77156d47bc4c3912a032e0392b2cee3d9f793dc Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 6 Sep 2019 17:07:50 +0530 Subject: [PATCH] Fix failing test on py3 --- src/calibre/ebooks/pdf/html_writer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/pdf/html_writer.py b/src/calibre/ebooks/pdf/html_writer.py index 7f0c02a081..8552a89286 100644 --- a/src/calibre/ebooks/pdf/html_writer.py +++ b/src/calibre/ebooks/pdf/html_writer.py @@ -43,7 +43,9 @@ from calibre.utils.podofo import ( dedup_type3_fonts, get_podofo, remove_unused_fonts, set_metadata_implementation ) from calibre.utils.short_uuid import uuid4 -from polyglot.builtins import as_bytes, filter, iteritems, map, range, unicode_type +from polyglot.builtins import ( + as_bytes, as_unicode, filter, iteritems, map, range, unicode_type +) from polyglot.urllib import urlparse OK, KILL_SIGNAL = range(0, 2) @@ -736,7 +738,7 @@ def merge_cmaps(cmaps): headerlines = [] footerlines = [] prefix_ended = False - for line in cmap.decode('utf-8', 'replace').splitlines(): + for line in as_unicode(cmap, errors='replace').splitlines(): line = line.strip() if state is header: headerlines.append(line)