diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-18 11:00:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-18 11:00:22 +0100 |
| commit | 2f91d16033a87f7f52aa722c91765cc488853795 (patch) | |
| tree | 4a789f088b606c7ab4da9c8021e0f139aa987927 /synapse | |
| parent | Ensure we have a 'membership' key in RoomMemberEvents (diff) | |
| download | synapse-2f91d16033a87f7f52aa722c91765cc488853795.tar.xz | |
We don't need to do a json.loads here
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 303759b718..fe0953c69d 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -115,7 +115,7 @@ class RoomTopicRestServlet(RestServlet): if not data: raise SynapseError(404, "Topic not found.", errcode=Codes.NOT_FOUND) - defer.returnValue((200, json.loads(data.content))) + defer.returnValue((200, data.content)) @defer.inlineCallbacks def on_PUT(self, request, room_id): @@ -175,7 +175,7 @@ class RoomMemberRestServlet(RestServlet): if not member: raise SynapseError(404, "Member not found.", errcode=Codes.NOT_FOUND) - defer.returnValue((200, json.loads(member.content))) + defer.returnValue((200, member.content)) @defer.inlineCallbacks def on_DELETE(self, request, roomid, target_user_id): |