summary refs log tree commit diff
path: root/synapse/rest
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/rest
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/rest')
-rw-r--r--synapse/rest/client/v1/login.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index f13272da8e..c14e8af00e 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -252,7 +252,7 @@ class SAML2RestServlet(ClientV1RestServlet):
             SP = Saml2Client(conf)
             saml2_auth = SP.parse_authn_request_response(
                 request.args['SAMLResponse'][0], BINDING_HTTP_POST)
-        except Exception, e:        # Not authenticated
+        except Exception as e:        # Not authenticated
             logger.exception(e)
         if saml2_auth and saml2_auth.status_ok() and not saml2_auth.not_signed:
             username = saml2_auth.name_id.text