X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Ftrust%2Fcertificate.py;h=a30d73aab0c21c7e2c50d51b21723cd4e18c92bf;hp=5782910984988235592da93dbb9eaf7ae6f1dd52;hb=70a671de96cb9dd3d13fc8ea3eba165a52849ffd;hpb=915e3b43952aa7bad3b861bf4e01feeb8ab882c4

diff --git a/sfa/trust/certificate.py b/sfa/trust/certificate.py
index 57829109..a30d73aa 100644
--- a/sfa/trust/certificate.py
+++ b/sfa/trust/certificate.py
@@ -47,6 +47,8 @@ import OpenSSL
 # M2Crypto is imported on the fly to minimize crashes
 #import M2Crypto
 
+from sfa.util.py23 import PY3
+
 from sfa.util.faults import CertExpired, CertMissingParent, CertNotSignedByParent
 from sfa.util.sfalogging import logger
 
@@ -432,7 +434,7 @@ class Certificate:
             logger.warn("None cert in certificate.save_to_string")
             return ""
         string = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, self.x509)
-        if isinstance(string, bytes):
+        if PY3 and isinstance(string, bytes):
             string = string.decode()
         if save_parents and self.parent:
             string = string + self.parent.save_to_string(save_parents)
@@ -448,7 +450,7 @@ class Certificate:
             f = filep
         else:
             f = open(filename, 'w')
-        if isinstance(string, bytes):
+        if PY3 and isinstance(string, bytes):
             string = string.decode()
         f.write(string)
         f.close()