X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential_factory.py;h=a51673efa41bc1d8b963744e647a4dfde7f21f46;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hp=ef738af34523fd101c9a5319b4c6270cec0878c6;hpb=fad16c7d54b658b37a9b42fbee47b0d4f51cb8ec;p=sfa.git

diff --git a/sfa/trust/credential_factory.py b/sfa/trust/credential_factory.py
index ef738af3..a51673ef 100644
--- a/sfa/trust/credential_factory.py
+++ b/sfa/trust/credential_factory.py
@@ -62,7 +62,7 @@ class CredentialFactory:
         if credFile:
             try:
                 credString = open(credFile).read()
-            except Exception, e:
+            except Exception as e:
                 logger.info("Error opening credential file %s: %s" % credFile, e)
                 return None
 
@@ -72,7 +72,7 @@ class CredentialFactory:
             if credO.has_key('geni_value') and credO.has_key('geni_type'):
                 cred_type = credO['geni_type']
                 credString = credO['geni_value']
-        except Exception, e:
+        except Exception as e:
             # It wasn't a struct. So the credString is XML. Pull the type directly from the string
             logger.debug("Credential string not JSON: %s" % e)
             cred_type = CredentialFactory.getType(credString)
@@ -81,7 +81,7 @@ class CredentialFactory:
             try:
                 cred = Credential(string=credString)
                 return cred
-            except Exception, e:
+            except Exception as e:
                 if credFile:
                     msg = "credString started: %s" % credString[:50]
                     raise Exception("%s not a parsable SFA credential: %s. " % (credFile, e) + msg)
@@ -92,7 +92,7 @@ class CredentialFactory:
             try:
                 cred = ABACCredential(string=credString)
                 return cred
-            except Exception, e:
+            except Exception as e:
                 if credFile:
                     raise Exception("%s not a parsable ABAC credential: %s" % (credFile, e))
                 else: