mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'calibre-complete' of https://github.com/eli-schwartz/calibre
This commit is contained in:
commit
ee97edc94d
@ -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)}
|
||||
|
Loading…
x
Reference in New Issue
Block a user