Fix content.json update and verify on Python 3.5

src/Content/ContentManager.py

@@ -4,6 +4,7 @@ import re
 import os
 import copy
 import base64
+import sys
 
 import gevent
 
@@ -901,7 +902,10 @@ class ContentManager(object):
                 if type(file) is dict:
                     new_content = file
                 else:
-                    new_content = json.load(file)
+                    if sys.version_info.major == 3 and sys.version_info.minor < 6:
+                        new_content = json.loads(file.read().decode("utf8"))
+                    else:
+                        new_content = json.load(file)
                 if inner_path in self.contents:
                     old_content = self.contents.get(inner_path, {"modified": 0})
                     # Checks if its newer the ours

src/File/FileRequest.py

@@ -117,7 +117,7 @@ class FileRequest(object):
             return
 
         try:
-            content = json.loads(params["body"])
+            content = json.loads(params["body"].decode())
         except Exception as err:
             self.log.debug("Update for %s is invalid JSON: %s" % (inner_path, err))
             self.response({"error": "File invalid JSON"})