X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Frecord.py;h=b88b02a0c7e4e4789f61fee43c0894185d2c0c92;hb=HEAD;hp=e8697040a77a3072b7b27458e5ad4db98a94efaf;hpb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;p=sfa.git

diff --git a/sfa/storage/record.py b/sfa/storage/record.py
index e8697040..b88b02a0 100644
--- a/sfa/storage/record.py
+++ b/sfa/storage/record.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 
 from sfa.util.sfatime import utcparse, datetime_to_string
 from datetime import datetime
@@ -6,7 +6,6 @@ from sfa.util.xml import XML
 from sfa.trust.gid import GID
 
 from sfa.util.sfalogging import logger
-from sfa.util.py23 import StringType
 
 
 class Record:
@@ -49,18 +48,18 @@ class Record:
 
         def exclude(k, v):
             return k.startswith('_') or isinstance(v, exclude_types)
-        keys = [k for k, v in d.items() if not exclude(k, v)]
+        keys = [k for k, v in list(d.items()) if not exclude(k, v)]
         return {k: d[k] for k in keys}
 
     def toxml(self):
         return self.save_as_xml()
 
     def load_from_dict(self, d):
-        for (k, v) in d.iteritems():
+        for (k, v) in d.items():
             # experimental
-            if isinstance(v, StringType) and v.lower() in ['true']:
+            if isinstance(v, str) and v.lower() in ['true']:
                 v = True
-            if isinstance(v, StringType) and v.lower() in ['false']:
+            if isinstance(v, str) and v.lower() in ['false']:
                 v = False
             setattr(self, k, v)
 
@@ -68,7 +67,7 @@ class Record:
     # for this purpose only, we need the subclasses to define 'fields' as either
     # a list or a dictionary
     def fields(self):
-        fields = self.__dict__.keys()
+        fields = list(self.__dict__.keys())
         return fields
 
     def save_as_xml(self):