Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-01-06 18:54:48 +01:00
Code Issues Projects Releases Wiki Activity

Handle passing str to json_loads

Browse source
This commit is contained in:
Kovid Goyal 2019-03-17 20:07:22 +05:30
parent 7d7731f5d0
commit dc4c444a71
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/calibre/utils/config_base.py
View file

@ -62,7 +62,9 @@ def json_dumps(obj):
def json_loads(raw):
import json
return json.loads(raw.decode('utf-8'), object_hook=from_json)
if isinstance(raw, bytes):
raw = raw.decode('utf-8')
return json.loads(raw, object_hook=from_json)
def make_config_dir():