From b18eb6202dbcaccf80d53c533a22f7d4bf733c54 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 9 Apr 2019 22:06:44 +0200 Subject: [PATCH] some odd code was obviously broken, it was using a str variable and then checking if that was instance of .. str --- sfa/trust/credential.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py index 92c114e3..8a6c0bbc 100644 --- a/sfa/trust/credential.py +++ b/sfa/trust/credential.py @@ -286,21 +286,19 @@ class Credential(object): self.version = cred['geni_version'] if string or filename: - if string: - str = string - elif filename: + if not string: with open(filename) as infile: - str = infile.read() + string = infile.read() # if this is a legacy credential, write error and bail out - if isinstance(str, str) and str.strip().startswith("-----"): + if isinstance(string, str) and string.strip().startswith("-----"): logger.error( "Legacy credentials not supported any more " "- giving up with {}..." .format(str[:10])) return else: - self.xml = str + self.xml = string self.decode() # not strictly necessary but won't hurt either self.get_xmlsec1_path() -- 2.43.0