oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix loading json files to db on Python 3.5

Browse source
This commit is contained in:
shortcutme 2019-03-20 00:49:27 +01:00
parent 77530f13ee
commit 7aff97b6ff
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Db/Db.py
View file

@ -5,12 +5,12 @@ import logging
import re import re
import os import os
import atexit import atexit
import sys
import gevent import gevent
from Debug import Debug from Debug import Debug
from .DbCursor import DbCursor from .DbCursor import DbCursor
from Config import config
from util import SafeRe from util import SafeRe
from util import helper from util import helper
@ -26,6 +26,7 @@ def dbCleanup():
if idle > 60 * 5 and db.close_idle: if idle > 60 * 5 and db.close_idle:
db.close() db.close()
def dbCommitCheck(): def dbCommitCheck():
while 1: while 1:
time.sleep(5) time.sleep(5)
@ -38,6 +39,7 @@ def dbCommitCheck():
db.need_commit = False db.need_commit = False
time.sleep(0.1) time.sleep(0.1)
def dbCloseAll(): def dbCloseAll():
for db in opened_dbs[:]: for db in opened_dbs[:]:
db.close() db.close()
@ -117,7 +119,6 @@ class Db(object):
self.log.error("Commit error: %s" % err) self.log.error("Commit error: %s" % err)
return False return False
def insertOrUpdate(self, *args, **kwargs): def insertOrUpdate(self, *args, **kwargs):
if not self.conn: if not self.conn:
self.connect() self.connect()
@ -298,7 +299,10 @@ class Db(object):
data = {} data = {}
else: else:
if file_path.endswith("json.gz"): 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: else:
data = json.load(file) data = json.load(file)
except Exception as err: except Exception as err: