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/profile.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/profile.py')
| -rw-r--r-- | synapse/rest/profile.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/rest/profile.py b/synapse/rest/profile.py index 72e02d8dd8..351863ab5d 100644 --- a/synapse/rest/profile.py +++ b/synapse/rest/profile.py @@ -19,7 +19,6 @@ from twisted.internet import defer from base import RestServlet, client_path_pattern import json -import urllib class ProfileDisplaynameRestServlet(RestServlet): @@ -27,7 +26,6 @@ class ProfileDisplaynameRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, user_id): - user_id = urllib.unquote(user_id) user = self.hs.parse_userid(user_id) displayname = yield self.handlers.profile_handler.get_displayname( @@ -39,7 +37,6 @@ class ProfileDisplaynameRestServlet(RestServlet): @defer.inlineCallbacks def on_PUT(self, request, user_id): auth_user = yield self.auth.get_user_by_req(request) - user_id = urllib.unquote(user_id) user = self.hs.parse_userid(user_id) try: @@ -62,7 +59,6 @@ class ProfileAvatarURLRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, user_id): - user_id = urllib.unquote(user_id) user = self.hs.parse_userid(user_id) avatar_url = yield self.handlers.profile_handler.get_avatar_url( @@ -74,7 +70,6 @@ class ProfileAvatarURLRestServlet(RestServlet): @defer.inlineCallbacks def on_PUT(self, request, user_id): auth_user = yield self.auth.get_user_by_req(request) - user_id = urllib.unquote(user_id) user = self.hs.parse_userid(user_id) try: @@ -97,7 +92,6 @@ class ProfileRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, user_id): - user_id = urllib.unquote(user_id) user = self.hs.parse_userid(user_id) displayname = yield self.handlers.profile_handler.get_displayname( |