diff options
author | Clint Byrum <clint@fewbar.com> | 2015-05-15 10:52:33 -0700 |
---|---|---|
committer | Clint Byrum <clint@fewbar.com> | 2015-05-15 11:52:15 -0700 |
commit | 99911f6c4c7d51071f70709e55fabcd2e6853284 (patch) | |
tree | 9ae82d0d6c11e05bd9bd152c94993d21f744b252 /example/idp2_repoze/idp.py | |
parent | 4ef44631df5426e0b4808b1c79b51a37eb026a76 (diff) | |
download | pysaml2-99911f6c4c7d51071f70709e55fabcd2e6853284.tar.gz |
Fix python3 syntax errors
Retains python2.7 compatibility for all files. Fixes only syntax errors,
tests still fail on python3 for various reasons.
Diffstat (limited to 'example/idp2_repoze/idp.py')
-rwxr-xr-x | example/idp2_repoze/idp.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/example/idp2_repoze/idp.py b/example/idp2_repoze/idp.py index 685fc0ba..cd6b486d 100755 --- a/example/idp2_repoze/idp.py +++ b/example/idp2_repoze/idp.py @@ -269,10 +269,10 @@ class SSO(Service): try: resp_args = IDP.response_args(_authn_req) _resp = None - except UnknownPrincipal, excp: + except UnknownPrincipal as excp: _resp = IDP.create_error_response(_authn_req.id, self.destination, excp) - except UnsupportedBinding, excp: + except UnsupportedBinding as excp: _resp = IDP.create_error_response(_authn_req.id, self.destination, excp) @@ -281,11 +281,11 @@ class SSO(Service): def do(self, query, binding_in, relay_state=""): try: resp_args, _resp = self.verify_request(query, binding_in) - except UnknownPrincipal, excp: + except UnknownPrincipal as excp: logger.error("UnknownPrincipal: %s" % (excp,)) resp = ServiceError("UnknownPrincipal: %s" % (excp,)) return resp(self.environ, self.start_response) - except UnsupportedBinding, excp: + except UnsupportedBinding as excp: logger.error("UnsupportedBinding: %s" % (excp,)) resp = ServiceError("UnsupportedBinding: %s" % (excp,)) return resp(self.environ, self.start_response) @@ -305,7 +305,7 @@ class SSO(Service): identity, userid=self.user, authn=AUTHN_BROKER[self.environ["idp.authn_ref"]], sign_assertion=sign_assertion, sign_response=False, **resp_args) - except Exception, excp: + except Exception as excp: logging.error(exception_trace(excp)) resp = ServiceError("Exception: %s" % (excp,)) return resp(self.environ, self.start_response) @@ -548,7 +548,7 @@ class SLO(Service): _, body = request.split("\n") logger.debug("req: '%s'" % body) req_info = IDP.parse_logout_request(body, binding) - except Exception, exc: + except Exception as exc: logger.error("Bad request: %s" % exc) resp = BadRequest("%s" % exc) return resp(self.environ, self.start_response) @@ -565,7 +565,7 @@ class SLO(Service): # remove the authentication try: IDP.session_db.remove_authn_statements(msg.name_id) - except KeyError, exc: + except KeyError as exc: logger.error("ServiceError: %s" % exc) resp = ServiceError("%s" % exc) return resp(self.environ, self.start_response) @@ -574,7 +574,7 @@ class SLO(Service): try: hinfo = IDP.apply_binding(binding, "%s" % resp, "", relay_state) - except Exception, exc: + except Exception as exc: logger.error("ServiceError: %s" % exc) resp = ServiceError("%s" % exc) return resp(self.environ, self.start_response) @@ -986,7 +986,7 @@ if __name__ == '__main__': PORT = 8088 SRV = make_server(HOST, PORT, application) - print "IdP listening on %s:%s" % (HOST, PORT) + print("IdP listening on %s:%s" % (HOST, PORT)) SRV.serve_forever() else: _rot = args.mako_root |