gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-17 19:43:34 +02:00
Code Issues Projects Releases Wiki Activity

Move force_uniceode to utils package

Browse Source
This commit is contained in:
gryf
2020-11-11 19:30:50 +01:00
parent 35c34c3b45
commit 3152c52839
16 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ebook_converter/utils/config_base.py
View File

@@ -7,10 +7,11 @@ import json
import numbers
import os
import pickle
import pkg_resources
import re
import traceback
import pkg_resources
from ebook_converter.constants_old import config_dir
from ebook_converter.constants_old import filesystem_encoding
from ebook_converter.constants_old import preferred_encoding
@@ -75,7 +76,8 @@ def from_json(obj):
return obj
def force_unicode(x):
def _force_unicode(x):
# TODO(gryf): eliminate cases, when this kind of functions are needed.
try:
return x.decode(preferred_encoding)
except UnicodeDecodeError:
@@ -87,7 +89,7 @@ def force_unicode(x):
def force_unicode_recursive(obj):
if isinstance(obj, bytes):
return force_unicode(obj)
return _force_unicode(obj)
if isinstance(obj, (list, tuple)):
return type(obj)(map(force_unicode_recursive, obj))
if isinstance(obj, dict):