From bd9593e1c5570c87041b78bee1eca3f0dcbe17a4 Mon Sep 17 00:00:00 2001 From: Filip Nowak Date: Tue, 21 Mar 2017 17:44:44 +0100 Subject: [PATCH] except syntax valid from python 2.6/7 up to 3.x --- test.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test.py b/test.py index 97f1909..2f06fc4 100644 --- a/test.py +++ b/test.py @@ -116,7 +116,7 @@ def main(): def testServicePrincipal(service, hostname): try: result = kerberos.getServerPrincipalDetails(service, hostname) - except kerberos.KrbError, e: + except kerberos.KrbError as e: print( "Kerberos service principal for %s/%s failed: %s" % (service, hostname, e[0]) @@ -132,7 +132,7 @@ def testServicePrincipal(service, hostname): def testCheckpassword(user, pswd, service, realm): try: kerberos.checkPassword(user, pswd, service, realm) - except kerberos.BasicAuthError, e: + except kerberos.BasicAuthError as e: print("Kerberos authentication for %s failed: %s" % (user, e[0])) else: print("Kerberos authentication for %s succeeded" % user) @@ -253,13 +253,13 @@ def sendRequest(host, port, ssl, method, uri, headers): mech_oid = kerberos.GSS_MECH_OID_SPNEGO rc, vc = kerberos.authGSSClientInit(service=service, mech_oid=mech_oid) - except kerberos.GSSError, e: + except kerberos.GSSError as e: print("Could not initialize GSSAPI: %s/%s" % (e[0][0], e[1][0])) return try: kerberos.authGSSClientStep(vc, "") - except kerberos.GSSError, e: + except kerberos.GSSError as e: print( "Could not do GSSAPI step with continue: %s/%s" % (e[0][0], e[1][0]) @@ -303,7 +303,7 @@ def sendRequest(host, port, ssl, method, uri, headers): try: kerberos.authGSSClientStep(vc, splits[1]) - except kerberos.GSSError, e: + except kerberos.GSSError as e: print( "Could not verify server www-authenticate header in second HTTP " "response: %s/%s" @@ -313,7 +313,7 @@ def sendRequest(host, port, ssl, method, uri, headers): try: kerberos.authGSSClientClean(vc) - except kerberos.GSSError, e: + except kerberos.GSSError as e: print("Could not clean-up GSSAPI: %s/%s" % (e[0][0], e[1][0])) return