X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fstorage%2Frecord.py;h=ac391a177e7bfec2048a7d8d78126bad772f1b85;hp=e8697040a77a3072b7b27458e5ad4db98a94efaf;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hpb=648ac3fd865ea29425485f26eb0a7bf1a62281e0 diff --git a/sfa/storage/record.py b/sfa/storage/record.py index e8697040..ac391a17 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 @@ -49,14 +49,14 @@ 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']: v = True @@ -68,7 +68,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):