summary refs log tree commit diff
path: root/synapse/rest/client/v1/admin.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-01-23 14:32:41 +0000
committerMark Haines <mjark@negativecurvature.net>2015-01-23 14:32:41 +0000
commitbda5d7d14f2b1d0948af54dc9fe9d5283df349d6 (patch)
tree3fa405f4094eff9318efed54568dac0533b876e2 /synapse/rest/client/v1/admin.py
parentMerge pull request #32 from matrix-org/remove_parse_id_from_hs (diff)
parentAdd RestServlet base class in synapse/http/servlet.py (diff)
downloadsynapse-bda5d7d14f2b1d0948af54dc9fe9d5283df349d6.tar.xz
Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1
Extract the client v1 base RestServlet to a separate class
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r--synapse/rest/client/v1/admin.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py
index 4aefb94053..1051d96f96 100644
--- a/synapse/rest/client/v1/admin.py
+++ b/synapse/rest/client/v1/admin.py
@@ -18,14 +18,14 @@ from twisted.internet import defer
 from synapse.api.errors import AuthError, SynapseError
 from synapse.types import UserID
 
-from base import RestServlet, client_path_pattern
+from base import ClientV1RestServlet, client_path_pattern
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class WhoisRestServlet(RestServlet):
+class WhoisRestServlet(ClientV1RestServlet):
     PATTERN = client_path_pattern("/admin/whois/(?P<user_id>[^/]*)")
 
     @defer.inlineCallbacks