Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: recursive forcing to unicode missed converting set()

Browse Source 
This resulted in e.g. ebook-convert-complete still storing most formats
in msgpack as bytestrings, and therefore not being completed.
This commit is contained in:
Eli Schwartz 2019-05-17 17:11:45 -04:00
parent b7d2c4b502
commit 09b4218b83
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/polyglot/builtins.py
View File

@ -38,12 +38,12 @@ def as_unicode(x, encoding='utf-8', errors='strict'):
def only_unicode_recursive(x, encoding='utf-8', errors='strict'): def only_unicode_recursive(x, encoding='utf-8', errors='strict'):
# Convert any bytestrings in lists/tuples/dicts to unicode # Convert any bytestrings in sets/lists/tuples/dicts to unicode
if isinstance(x, bytes): if isinstance(x, bytes):
return x.decode(encoding, errors) return x.decode(encoding, errors)
if isinstance(x, unicode_type): if isinstance(x, unicode_type):
return x return x
if isinstance(x, (list, tuple)): if isinstance(x, (set, list, tuple)):
return type(x)(only_unicode_recursive(i, encoding, errors) for i in x) return type(x)(only_unicode_recursive(i, encoding, errors) for i in x)
if isinstance(x, dict): if isinstance(x, dict):
return {only_unicode_recursive(k, encoding, errors): only_unicode_recursive(v, encoding, errors) for k, v in iteritems(x)} return {only_unicode_recursive(k, encoding, errors): only_unicode_recursive(v, encoding, errors) for k, v in iteritems(x)}