From 7aff97b6ff0490ba0022c7612889a8bc52b4dc34 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 20 Mar 2019 00:49:27 +0100
Subject: [PATCH] Fix loading json files to db on Python 3.5

---
 src/Db/Db.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Db/Db.py b/src/Db/Db.py
index a302b0f3..f63801b8 100644
--- a/src/Db/Db.py
+++ b/src/Db/Db.py
@@ -5,12 +5,12 @@ import logging
 import re
 import os
 import atexit
+import sys
 
 import gevent
 
 from Debug import Debug
 from .DbCursor import DbCursor
-from Config import config
 from util import SafeRe
 from util import helper
 
@@ -26,6 +26,7 @@ def dbCleanup():
             if idle > 60 * 5 and db.close_idle:
                 db.close()
 
+
 def dbCommitCheck():
     while 1:
         time.sleep(5)
@@ -38,6 +39,7 @@ def dbCommitCheck():
                 db.need_commit = False
             time.sleep(0.1)
 
+
 def dbCloseAll():
     for db in opened_dbs[:]:
         db.close()
@@ -117,7 +119,6 @@ class Db(object):
             self.log.error("Commit error: %s" % err)
             return False
 
-
     def insertOrUpdate(self, *args, **kwargs):
         if not self.conn:
             self.connect()
@@ -298,7 +299,10 @@ class Db(object):
                 data = {}
             else:
                 if file_path.endswith("json.gz"):
-                    data = json.load(helper.limitedGzipFile(fileobj=file))
+                    file = helper.limitedGzipFile(fileobj=file)
+
+                if sys.version_info.major == 3 and sys.version_info.minor < 6:
+                    data = json.loads(file.read().decode("utf8"))
                 else:
                     data = json.load(file)
         except Exception as err: