from tempfile import mkstemp
from xml.dom.minidom import Document, parseString
-from sfa.util.py23 import StringType
-from sfa.util.py23 import StringIO
+from sfa.util.py23 import PY3, StringType, StringIO
HAVELXML = False
try:
f = filep
else:
f = open(filename, "w")
- if isinstance(self.xml, bytes):
+ if PY3 and isinstance(self.xml, bytes):
self.xml = self.xml.decode()
f.write(self.xml)
f.close()
def save_to_string(self, save_parents=True):
if not self.xml:
self.encode()
- if isinstance(self.xml, bytes):
+ if PY3 and isinstance(self.xml, bytes):
self.xml = self.xml.decode()
return self.xml
message = "Delegated credential {} not signed by parent {}'s caller"\
.format(self.pretty_cred(), parent_cred.pretty_cred())
logger.error(message)
- logger.error("compare1 parent {}".format(parent_cred.get_gid_caller().pretty_cred()))
+ logger.error("compare1 parent {}".format(parent_cred.get_gid_caller().pretty_cert()))
logger.error("compare1 parent details {}".format(parent_cred.get_gid_caller().save_to_string()))
- logger.error("compare2 self {}".format(self.get_signature().get_issuer_gid().pretty_cred()))
+ logger.error("compare2 self {}".format(self.get_signature().get_issuer_gid().pretty_crert()))
logger.error("compare2 self details {}".format(self.get_signature().get_issuer_gid().save_to_string()))
raise CredentialNotVerifiable(message)