summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-08 11:08:20 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-08 11:08:20 +0000
commitea72bd960052f95599150a287a7fccbe668e2c23 (patch)
tree8ca401db42e800c7393fb3df3919bf754b918786 /synapse/handlers/register.py
parentMerge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id (diff)
parentUse syntax that works on both py2.7 and py3 (diff)
downloadsynapse-ea72bd960052f95599150a287a7fccbe668e2c23.tar.xz
Merge pull request #631 from matrix-org/markjh/py3v1
Use syntax that's valid on both py2.7 and py3
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index c5e5b28811..e2ace6a4e5 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -241,7 +241,7 @@ class RegistrationHandler(BaseHandler):
                 password_hash=None
             )
             yield registered_user(self.distributor, user)
-        except Exception, e:
+        except Exception as e:
             yield self.store.add_access_token_to_user(user_id, token)
             # Ignore Registration errors
             logger.exception(e)