summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
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/v2_alpha
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/v2_alpha')
-rw-r--r--synapse/rest/client/v2_alpha/devices.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/devices.py b/synapse/rest/client/v2_alpha/devices.py
index aded2409be..9b75bb1377 100644
--- a/synapse/rest/client/v2_alpha/devices.py
+++ b/synapse/rest/client/v2_alpha/devices.py
@@ -19,9 +19,9 @@ from twisted.internet import defer
 
 from synapse.api import errors
 from synapse.http.servlet import (
+    RestServlet,
     assert_params_in_dict,
     parse_json_object_from_request,
-    RestServlet
 )
 
 from ._base import client_v2_patterns, interactive_auth_handler