OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

We don't need to do a json.loads here

paul/schema_breaking_changes
Erik Johnston 2014-08-18 11:00:22 +01:00
parent 1a1e0384ef
commit 2f91d16033
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/rest/room.py
View File

@ -115,7 +115,7 @@ class RoomTopicRestServlet(RestServlet):
if not data: if not data:
raise SynapseError(404, "Topic not found.", errcode=Codes.NOT_FOUND) raise SynapseError(404, "Topic not found.", errcode=Codes.NOT_FOUND)
defer.returnValue((200, json.loads(data.content))) defer.returnValue((200, data.content))
@defer.inlineCallbacks @defer.inlineCallbacks
def on_PUT(self, request, room_id): def on_PUT(self, request, room_id):
@ -175,7 +175,7 @@ class RoomMemberRestServlet(RestServlet):
if not member: if not member:
raise SynapseError(404, "Member not found.", raise SynapseError(404, "Member not found.",
errcode=Codes.NOT_FOUND) errcode=Codes.NOT_FOUND)
defer.returnValue((200, json.loads(member.content))) defer.returnValue((200, member.content))
@defer.inlineCallbacks @defer.inlineCallbacks
def on_DELETE(self, request, roomid, target_user_id): def on_DELETE(self, request, roomid, target_user_id):