From dc4c444a71f8663c83bf081939bd6f562783e350 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 17 Mar 2019 20:07:22 +0530
Subject: [PATCH] Handle passing str to json_loads

---
 src/calibre/utils/config_base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py
index 21281e0b46..b78a14b3e3 100644
--- a/src/calibre/utils/config_base.py
+++ b/src/calibre/utils/config_base.py
@@ -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():