summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-07-17 13:41:59 +1000
committerGitHub <noreply@github.com>2018-07-17 13:41:59 +1000
commitfe10dd9fb220ef5c0ee7c6e33e2e6dff56a84f06 (patch)
treecc6bec924e11bcc49d0f6491a5699a3624c0014d /synapse/rest/client/v1
parentFix develop because I broke it :( (#3535) (diff)
parentrename 'isort' to 'check_isort' as requested (diff)
downloadsynapse-fe10dd9fb220ef5c0ee7c6e33e2e6dff56a84f06.tar.xz
Merge pull request #3540 from krombel/enforce_isort
check isort by travis
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/admin.py4
-rw-r--r--synapse/rest/client/v1/initial_sync.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py

index 01c3f2eb04..2dc50e582b 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py
@@ -24,9 +24,9 @@ from synapse.api.constants import Membership from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError from synapse.http.servlet import ( assert_params_in_dict, - parse_json_object_from_request, parse_integer, - parse_string + parse_json_object_from_request, + parse_string, ) from synapse.types import UserID, create_requester diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py
index 00a1a99feb..fd5f85b53e 100644 --- a/synapse/rest/client/v1/initial_sync.py +++ b/synapse/rest/client/v1/initial_sync.py
@@ -15,8 +15,8 @@ from twisted.internet import defer -from synapse.streams.config import PaginationConfig from synapse.http.servlet import parse_boolean +from synapse.streams.config import PaginationConfig from .base import ClientV1RestServlet, client_path_patterns