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
# Try to treat the file as JSON, getting the cred_type from the struct
try:
credO = json.loads(credString, encoding='ascii')
- if credO.has_key('geni_value') and credO.has_key('geni_type'):
+ if 'geni_value' in credO and 'geni_type' in credO:
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)
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)
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: