diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/rest/client/v1/room.py | |
parent | Add an isort configuration (#3463) (diff) | |
parent | changelog (diff) | |
download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r-- | synapse/rest/client/v1/room.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index e6ae5db79b..2470db52ba 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -15,23 +15,27 @@ # limitations under the License. """ This module contains REST servlets to do with rooms: /rooms/<paths> """ +import logging + +from six.moves.urllib import parse as urlparse + +from canonicaljson import json + from twisted.internet import defer -from .base import ClientV1RestServlet, client_path_patterns -from synapse.api.errors import SynapseError, Codes, AuthError -from synapse.streams.config import PaginationConfig from synapse.api.constants import EventTypes, Membership +from synapse.api.errors import AuthError, Codes, SynapseError from synapse.api.filtering import Filter -from synapse.types import UserID, RoomID, RoomAlias, ThirdPartyInstanceID -from synapse.events.utils import serialize_event, format_event_for_client_v2 +from synapse.events.utils import format_event_for_client_v2, serialize_event from synapse.http.servlet import ( - parse_json_object_from_request, parse_string, parse_integer + parse_integer, + parse_json_object_from_request, + parse_string, ) +from synapse.streams.config import PaginationConfig +from synapse.types import RoomAlias, RoomID, ThirdPartyInstanceID, UserID -from six.moves.urllib import parse as urlparse - -import logging -from canonicaljson import json +from .base import ClientV1RestServlet, client_path_patterns logger = logging.getLogger(__name__) |