X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=7f786825f79fb84fee3497f8d0a3a2d5e22fb514;hb=b2b71376bbfa4a510beeceefcef9b4dc20e5e3dc;hp=0aa616213a98631771c34b57c2a7ecafeb85ae97;hpb=915e3b43952aa7bad3b861bf4e01feeb8ab882c4;p=sfa.git

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index 0aa61621..7f786825 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -34,8 +34,7 @@ import datetime
 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:
@@ -579,7 +578,7 @@ class Credential(object):
             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()
@@ -587,7 +586,7 @@ class Credential(object):
     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
 
@@ -1061,9 +1060,9 @@ class Credential(object):
             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)