diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-09-03 11:42:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 11:42:45 +0100 |
| commit | 2a447826665a5ac8e12736214f0ef2401e72f1f9 (patch) | |
| tree | ee18930dd9db500a09ad8901ac67ebe4a38c233d /synapse/handlers/initial_sync.py | |
| parent | Opentrace device lists (#5853) (diff) | |
| download | synapse-2a447826665a5ac8e12736214f0ef2401e72f1f9.tar.xz | |
Remove double return statements (#5962)
Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
Diffstat (limited to 'synapse/handlers/initial_sync.py')
| -rw-r--r-- | synapse/handlers/initial_sync.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 595f75400b..f991efeee3 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -450,7 +450,6 @@ class InitialSyncHandler(BaseHandler): # else it will throw. member_event = yield self.auth.check_user_was_in_room(room_id, user_id) return member_event.membership, member_event.event_id - return except AuthError: visibility = yield self.state_handler.get_current_state( room_id, EventTypes.RoomHistoryVisibility, "" @@ -460,7 +459,6 @@ class InitialSyncHandler(BaseHandler): and visibility.content["history_visibility"] == "world_readable" ): return Membership.JOIN, None - return raise AuthError( 403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN ) |