diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
| commit | 485bb64ddbcc372c5ed3d74190eda06f02cb3f82 (patch) | |
| tree | e89ec33366b907bea794e9140f962d2951b29ff9 /synapse/rest/register.py | |
| parent | Use new StreamToken in pagination config (diff) | |
| parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
| download | synapse-485bb64ddbcc372c5ed3d74190eda06f02cb3f82.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest/register.py')
| -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, |