diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
| commit | b56730bb6e549e6b22c95858cae50e091de96844 (patch) | |
| tree | 0eb011bc6b32a44df8c343ffedbc15e2ddd046e9 /synapse/rest/directory.py | |
| parent | schema version is now 10 (diff) | |
| parent | Update README.rst (diff) | |
| download | synapse-b56730bb6e549e6b22c95858cae50e091de96844.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
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 |