diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
commit | 1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch) | |
tree | 92d4bb31a1372239e317f8672d6b80e59b709523 /synapse/rest | |
parent | Oops. Removed my NetBeans private folders (diff) | |
parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
download | synapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz |
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/register.py | 4 |
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, |