diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 11:08:20 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 11:08:20 +0000 |
| commit | ea72bd960052f95599150a287a7fccbe668e2c23 (patch) | |
| tree | 8ca401db42e800c7393fb3df3919bf754b918786 /synapse/handlers | |
| parent | Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id (diff) | |
| parent | Use syntax that works on both py2.7 and py3 (diff) | |
| download | synapse-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')
| -rw-r--r-- | synapse/handlers/federation.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6e50b0963e..27f2b40bfe 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -472,7 +472,7 @@ class FederationHandler(BaseHandler): limit=100, extremities=[e for e in extremities.keys()] ) - except SynapseError: + except SynapseError as e: logger.info( "Failed to backfill from %s because %s", dom, e, 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) |