rset.py
changeset 10662 10942ed172de
parent 10609 e2d8e81bfe68
child 10687 d394bfcd8c25
--- a/rset.py	Tue Sep 08 18:04:57 2015 +0200
+++ b/rset.py	Tue Sep 15 16:15:03 2015 +0200
@@ -103,7 +103,7 @@
         if self._rsetactions is None:
             self._rsetactions = {}
         if kwargs:
-            key = tuple(sorted(kwargs.iteritems()))
+            key = tuple(sorted(kwargs.items()))
         else:
             key = None
         try:
@@ -509,9 +509,9 @@
             eschema = entity.e_schema
             eid_col, attr_cols, rel_cols = self._rset_structure(eschema, col)
             entity.eid = rowvalues[eid_col]
-            for attr, col_idx in attr_cols.iteritems():
+            for attr, col_idx in attr_cols.items():
                 entity.cw_attr_cache[attr] = rowvalues[col_idx]
-            for (rtype, role), col_idx in rel_cols.iteritems():
+            for (rtype, role), col_idx in rel_cols.items():
                 value = rowvalues[col_idx]
                 if value is None:
                     if role == 'subject':