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

Fix verify invalid json

Browse source
This commit is contained in:
shortcutme 2019-12-31 12:44:47 +01:00
parent 60146a083c
commit 796ee572ce
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Content/ContentManager.py
View file

@ -936,10 +936,13 @@ class ContentManager(object):
if type(file) is dict: if type(file) is dict:
new_content = file new_content = file
else: else:
if sys.version_info.major == 3 and sys.version_info.minor < 6: try:
new_content = json.loads(file.read().decode("utf8")) if sys.version_info.major == 3 and sys.version_info.minor < 6:
else: new_content = json.loads(file.read().decode("utf8"))
new_content = json.load(file) else:
new_content = json.load(file)
except Exception as err:
raise VerifyError("Invalid json file: %s" % err)
if inner_path in self.contents: if inner_path in self.contents:
old_content = self.contents.get(inner_path, {"modified": 0}) old_content = self.contents.get(inner_path, {"modified": 0})
# Checks if its newer the ours # Checks if its newer the ours