summary refs log tree commit diff
path: root/synapse/rest/register.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 09:26:33 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 09:26:33 +0100
commit47c3a089c5c3016197964f16f611f72bc4aadde6 (patch)
treef0a4d1a660e4ae2a58077ad1c250353781445cff /synapse/rest/register.py
parentRemoved member list servlet: now using generic state paths. (diff)
parentOrder 'get_recent_events_for_room' correctly. (diff)
downloadsynapse-47c3a089c5c3016197964f16f611f72bc4aadde6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'synapse/rest/register.py')
-rw-r--r--synapse/rest/register.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/register.py b/synapse/rest/register.py
index eb457562b9..f17ec11cf4 100644
--- a/synapse/rest/register.py
+++ b/synapse/rest/register.py
@@ -33,10 +33,10 @@ class RegisterRestServlet(RestServlet):
         try:
             register_json = json.loads(request.content.read())
             if "password" in register_json:
-                password = register_json["password"]
+                password = register_json["password"].encode("utf-8")
 
             if type(register_json["user_id"]) == unicode:
-                desired_user_id = register_json["user_id"]
+                desired_user_id = register_json["user_id"].encode("utf-8")
                 if urllib.quote(desired_user_id) != desired_user_id:
                     raise SynapseError(
                         400,