diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-19 13:40:02 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-19 13:40:02 +0000 |
| commit | 45a6869cb46ec07c475fca2fee83e4c906a54e94 (patch) | |
| tree | 9714da089fd65cd5820b8f8353fcd244102448b2 /synapse/rest/directory.py | |
| parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
| parent | Bump web sdk version to 0.6.0 (diff) | |
| download | synapse-45a6869cb46ec07c475fca2fee83e4c906a54e94.tar.xz | |
Merge branch 'release-v0.6.0' v0.6.0
Diffstat (limited to 'synapse/rest/directory.py')
| -rw-r--r-- | synapse/rest/directory.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py index 35300c6a6f..868fa7abed 100644 --- a/synapse/rest/directory.py +++ b/synapse/rest/directory.py @@ -21,7 +21,6 @@ from base import RestServlet, client_path_pattern import json import logging -import urllib logger = logging.getLogger(__name__) @@ -36,9 +35,7 @@ class ClientDirectoryServer(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_alias): - room_alias = self.hs.parse_roomalias( - urllib.unquote(room_alias).decode("utf-8") - ) + room_alias = self.hs.parse_roomalias(room_alias) dir_handler = self.handlers.directory_handler res = yield dir_handler.get_association(room_alias) @@ -56,9 +53,7 @@ class ClientDirectoryServer(RestServlet): logger.debug("Got content: %s", content) - room_alias = self.hs.parse_roomalias( - urllib.unquote(room_alias).decode("utf-8") - ) + room_alias = self.hs.parse_roomalias(room_alias) logger.debug("Got room name: %s", room_alias.to_string()) @@ -97,9 +92,7 @@ class ClientDirectoryServer(RestServlet): dir_handler = self.handlers.directory_handler - room_alias = self.hs.parse_roomalias( - urllib.unquote(room_alias).decode("utf-8") - ) + room_alias = self.hs.parse_roomalias(room_alias) yield dir_handler.delete_association( user.to_string(), room_alias |