summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-26 13:49:38 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-26 13:49:38 +0100
commit6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71 (patch)
tree22fc258521ec6c2e46c84a1cd579deb2ca8a7cfb /synapse/rest
parentMerge pull request #253 from matrix-org/tox (diff)
parentMerge erikj/user_dedup to develop (diff)
downloadsynapse-6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71.tar.xz
Merge pull request #255 from matrix-org/mergeeriksmadness
Merge erikj/user_dedup to develop
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/login.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 3a0707c2ee..e580f71964 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -83,10 +83,11 @@ class LoginRestServlet(ClientV1RestServlet):
 
         if not user_id.startswith('@'):
             user_id = UserID.create(
-                user_id, self.hs.hostname).to_string()
+                user_id, self.hs.hostname
+            ).to_string()
 
         auth_handler = self.handlers.auth_handler
-        access_token, refresh_token = yield auth_handler.login_with_password(
+        user_id, access_token, refresh_token = yield auth_handler.login_with_password(
             user_id=user_id,
             password=login_submission["password"])