summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/account.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-03-16 16:35:45 +0000
committerDavid Baker <dbkr@users.noreply.github.com>2016-03-16 16:35:45 +0000
commit48b2e853a89a7dc4985e83b19ba1e1c24a6109fc (patch)
tree164fa81b554a0f4a425024b1f11907083fbb137a /synapse/rest/client/v2_alpha/account.py
parentMerge pull request #647 from matrix-org/markjh/pushers_stream (diff)
parentpep8 (diff)
downloadsynapse-48b2e853a89a7dc4985e83b19ba1e1c24a6109fc.tar.xz
Merge pull request #649 from matrix-org/dbkr/idempotent_registration
Make registration idempotent
Diffstat (limited to 'synapse/rest/client/v2_alpha/account.py')
-rw-r--r--synapse/rest/client/v2_alpha/account.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index dd4ea45588..7f8a6a4cf7 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -43,7 +43,7 @@ class PasswordRestServlet(RestServlet):
 
         body = parse_json_object_from_request(request)
 
-        authed, result, params = yield self.auth_handler.check_auth([
+        authed, result, params, _ = yield self.auth_handler.check_auth([
             [LoginType.PASSWORD],
             [LoginType.EMAIL_IDENTITY]
         ], body, self.hs.get_ip_from_request(request))