diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-10-23 15:52:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-10-23 15:52:32 +0100 |
| commit | eaaabc6c4f93d49f090ef7ff930fa2739428a36f (patch) | |
| tree | f5e5f3565589bc31d3dc9580608148b9d2f03a7c /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff) | |
| download | synapse-eaaabc6c4f93d49f090ef7ff930fa2739428a36f.tar.xz | |
replace 'except:' with 'except Exception:'
what could possibly go wrong
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 = {} |