diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-11-01 02:43:24 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 02:43:24 +1100 |
| commit | 020add50997f697c7847ac84b86b457ba2f3e32d (patch) | |
| tree | 4fe9abbcd1cac11bfe9077a85ceabd7bf9ea94ce /synapse/handlers/room.py | |
| parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
| download | synapse-020add50997f697c7847ac84b86b457ba2f3e32d.tar.xz | |
Update black to 19.10b0 (#6304)
* update version of black and also fix the mypy config being overridden
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 650bd28abb..0182e5b432 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -147,21 +147,22 @@ class RoomCreationHandler(BaseHandler): # we create and auth the tombstone event before properly creating the new # room, to check our user has perms in the old room. - tombstone_event, tombstone_context = ( - yield self.event_creation_handler.create_event( - requester, - { - "type": EventTypes.Tombstone, - "state_key": "", - "room_id": old_room_id, - "sender": user_id, - "content": { - "body": "This room has been replaced", - "replacement_room": new_room_id, - }, + ( + tombstone_event, + tombstone_context, + ) = yield self.event_creation_handler.create_event( + requester, + { + "type": EventTypes.Tombstone, + "state_key": "", + "room_id": old_room_id, + "sender": user_id, + "content": { + "body": "This room has been replaced", + "replacement_room": new_room_id, }, - token_id=requester.access_token_id, - ) + }, + token_id=requester.access_token_id, ) old_room_version = yield self.store.get_room_version(old_room_id) yield self.auth.check_from_context( |