Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event

This commit is contained in:
David Baker 2016-02-26 13:40:25 +00:00
parent 354d3842b5 9329cd5f13
commit 413e36b17a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/rest/client/v1/login.py
View File

@ -404,10 +404,12 @@ def _parse_json(request):
try: try:
content = json.loads(request.content.read()) content = json.loads(request.content.read())
if type(content) != dict: if type(content) != dict:
raise SynapseError(400, "Content must be a JSON object.") raise SynapseError(
400, "Content must be a JSON object.", errcode=Codes.BAD_JSON
)
return content return content
except ValueError: except ValueError:
raise SynapseError(400, "Content not JSON.") raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)
def register_servlets(hs, http_server): def register_servlets(hs, http_server):