diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
| commit | 39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch) | |
| tree | 8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/rest/client/v1/room.py | |
| parent | Correctly wire in update group profile over federation (diff) | |
| parent | Merge pull request #2568 from matrix-org/rav/pep8 (diff) | |
| download | synapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 6c379d53ac..75b735b47d 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -238,7 +238,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet): try: content = parse_json_object_from_request(request) - except: + except Exception: # Turns out we used to ignore the body entirely, and some clients # cheekily send invalid bodies. content = {} @@ -247,7 +247,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet): room_id = room_identifier try: remote_room_hosts = request.args["server_name"] - except: + except Exception: remote_room_hosts = None elif RoomAlias.is_valid(room_identifier): handler = self.handlers.room_member_handler @@ -587,7 +587,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet): try: content = parse_json_object_from_request(request) - except: + except Exception: # Turns out we used to ignore the body entirely, and some clients # cheekily send invalid bodies. content = {} |