diff options
| author | David Baker <dave@matrix.org> | 2018-07-19 18:25:25 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-07-19 18:25:25 +0100 |
| commit | 2669e494e0e5898fa24ab294b30a0158fb89926d (patch) | |
| tree | 5170f0b1f4c18ba7ad60540b601f1433371f85b8 /synapse/handlers/room.py | |
| parent | Merge pull request #3557 from matrix-org/dbkr/delete_profiles (diff) | |
| parent | Merge pull request #3377 from Valodim/note-affinity (diff) | |
| download | synapse-2669e494e0e5898fa24ab294b30a0158fb89926d.tar.xz | |
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 566a5d1ebf..78444efad2 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -15,23 +15,20 @@ # limitations under the License. """Contains functions for performing events on rooms.""" -from twisted.internet import defer +import logging +import math +import string +from collections import OrderedDict -from ._base import BaseHandler +from twisted.internet import defer -from synapse.types import UserID, RoomAlias, RoomID, RoomStreamToken -from synapse.api.constants import ( - EventTypes, JoinRules, RoomCreationPreset -) +from synapse.api.constants import EventTypes, JoinRules, RoomCreationPreset from synapse.api.errors import AuthError, Codes, StoreError, SynapseError +from synapse.types import RoomAlias, RoomID, RoomStreamToken, UserID from synapse.util import stringutils from synapse.visibility import filter_events_for_client -from collections import OrderedDict - -import logging -import math -import string +from ._base import BaseHandler logger = logging.getLogger(__name__) |