a little nicer wrt pep8

[sfa.git] / sfa / storage / model.py

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 6cb5f1d..b46c702 100644 (file)
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -13,7 +13,6 @@ from sfa.storage.record import Record
 from sfa.util.sfalogging import logger
 from sfa.util.sfatime import utcparse, datetime_to_string
 from sfa.util.xml import XML
-from sfa.util.py23 import StringType
 
 from sfa.trust.gid import GID
 
@@ -55,7 +54,7 @@ class AlchemyObj(Record):
         self._i = iter(object_mapper(self).columns)
         return self
 
-    def next(self):
+    def __next__(self):
         n = self._i.next().name
         return n, getattr(self, n)
 
@@ -105,7 +104,7 @@ class RegRecord(Base, AlchemyObj):
         if hrn:
             self.hrn = hrn
         if gid:
-            if isinstance(gid, StringType):
+            if isinstance(gid, str):
                 self.gid = gid
             else:
                 self.gid = gid.save_to_string(save_parents=True)
@@ -143,7 +142,7 @@ class RegRecord(Base, AlchemyObj):
     def validate_gid(self, key, gid):
         if gid is None:
             return
-        elif isinstance(gid, StringType):
+        elif isinstance(gid, str):
             return gid
         else:
             return gid.save_to_string(save_parents=True)
@@ -529,7 +528,7 @@ def make_record_dict(record_dict):
 def make_record_xml(xml_str):
     xml = XML(xml_str)
     xml_dict = xml.todict()
-    logger.info("load from xml, keys=%s" % xml_dict.keys())
+    logger.info("load from xml, keys=%s" % list(xml_dict.keys()))
     return make_record_dict(xml_dict)
 
 ####################
@@ -581,7 +580,7 @@ def augment_with_sfa_builtins(local_record):
     # search in map according to record type
     type_map = augment_map.get(local_record.type, {})
     # use type-dep. map to do the job
-    for (field_name, attribute) in type_map.items():
+    for (field_name, attribute) in list(type_map.items()):
         # get related objects
         related_records = getattr(local_record, attribute, [])
         hrns = [r.hrn for r in related_records]