X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;fp=sfa%2Ftrust%2Fcredential.py;h=92c114e36220f4db5d939afc859a0cbbd619ab73;hp=307ed950df85bd884b4915f88e9d420202e136af;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hpb=e5537b113b6fe5874fdcd5b12414568500aa106c;ds=sidebyside

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index 307ed950..92c114e3 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -36,7 +36,7 @@ import datetime
 from tempfile import mkstemp
 from xml.dom.minidom import Document, parseString
 
-from sfa.util.py23 import PY3, StringType, StringIO
+from io import StringIO
 
 from xml.parsers.expat import ExpatError
 
@@ -276,7 +276,7 @@ class Credential(object):
         self.version = None
 
         if cred:
-            if isinstance(cred, StringType):
+            if isinstance(cred, str):
                 string = cred
                 self.type = Credential.SFA_CREDENTIAL_TYPE
                 self.version = '3'
@@ -293,7 +293,7 @@ class Credential(object):
                     str = infile.read()
 
             # if this is a legacy credential, write error and bail out
-            if isinstance(str, StringType) and str.strip().startswith("-----"):
+            if isinstance(str, str) and str.strip().startswith("-----"):
                 logger.error(
                     "Legacy credentials not supported any more "
                     "- giving up with {}..."
@@ -639,7 +639,7 @@ class Credential(object):
             f = filep
         else:
             f = open(filename, "w")
-        if PY3 and isinstance(self.xml, bytes):
+        if isinstance(self.xml, bytes):
             self.xml = self.xml.decode()
         f.write(self.xml)
         f.close()
@@ -647,7 +647,7 @@ class Credential(object):
     def save_to_string(self, save_parents=True):
         if not self.xml:
             self.encode()
-        if PY3 and isinstance(self.xml, bytes):
+        if isinstance(self.xml, bytes):
             self.xml = self.xml.decode()
         return self.xml