Merge pull request #70 from jangsutsr/5913_allow_parsing_null_json_data

Allow parsing null JSON data
This commit is contained in:
Aaron Tan
2017-07-27 16:05:26 -04:00
committed by GitHub
2 changed files with 32 additions and 1 deletions
+3 -1
View File
@@ -57,8 +57,10 @@ class JSONParser(parsers.JSONParser):
try:
data = stream.read().decode(encoding)
if not data:
return {}
obj = json.loads(data, object_pairs_hook=OrderedDict)
if not isinstance(obj, dict):
if not isinstance(obj, dict) and obj is not None:
raise ParseError(_('JSON parse error - not a JSON object'))
return obj
except ValueError as exc: