Merge branch 'calibre-complete' of https://github.com/eli-schwartz/calibre

This commit is contained in:
Kovid Goyal 2019-05-20 06:31:45 +05:30
commit ee97edc94d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

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'):
# Convert any bytestrings in lists/tuples/dicts to unicode
# Convert any bytestrings in sets/lists/tuples/dicts to unicode
if isinstance(x, bytes):
return x.decode(encoding, errors)
if isinstance(x, unicode_type):
return x
if isinstance(x, (list, tuple)):
if isinstance(x, (set, list, tuple, frozenset)):
return type(x)(only_unicode_recursive(i, encoding, errors) for i in x)
if isinstance(x, dict):
return {only_unicode_recursive(k, encoding, errors): only_unicode_recursive(v, encoding, errors) for k, v in iteritems(x)}