Fix failing test on py3

This commit is contained in:
Kovid Goyal 2019-09-06 17:07:50 +05:30
parent 13211f3ab8
commit c77156d47b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -43,7 +43,9 @@ from calibre.utils.podofo import (
dedup_type3_fonts, get_podofo, remove_unused_fonts, set_metadata_implementation dedup_type3_fonts, get_podofo, remove_unused_fonts, set_metadata_implementation
) )
from calibre.utils.short_uuid import uuid4 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 from polyglot.urllib import urlparse
OK, KILL_SIGNAL = range(0, 2) OK, KILL_SIGNAL = range(0, 2)
@ -736,7 +738,7 @@ def merge_cmaps(cmaps):
headerlines = [] headerlines = []
footerlines = [] footerlines = []
prefix_ended = False prefix_ended = False
for line in cmap.decode('utf-8', 'replace').splitlines(): for line in as_unicode(cmap, errors='replace').splitlines():
line = line.strip() line = line.strip()
if state is header: if state is header:
headerlines.append(line) headerlines.append(line)