summary refs log tree commit diff
path: root/synapse/rest/client/v1/admin.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-09 10:24:43 +0100
committerGitHub <noreply@github.com>2018-07-09 10:24:43 +0100
commit395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch)
tree1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/rest/client/v1/admin.py
parentAdd an isort configuration (#3463) (diff)
parentchangelog (diff)
downloadsynapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r--synapse/rest/client/v1/admin.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py

index 8fb08dc526..2b091d61a5 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py
@@ -14,19 +14,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.internet import defer +import logging from six.moves import http_client +from twisted.internet import defer + from synapse.api.constants import Membership -from synapse.api.errors import AuthError, SynapseError, Codes, NotFoundError -from synapse.types import UserID, create_requester +from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError from synapse.http.servlet import parse_json_object_from_request +from synapse.types import UserID, create_requester from .base import ClientV1RestServlet, client_path_patterns -import logging - logger = logging.getLogger(__name__)