git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a little nicer wrt pep8
[sfa.git]
/
sfa
/
storage
/
record.py
diff --git
a/sfa/storage/record.py
b/sfa/storage/record.py
index
e869704
..
b88b02a
100644
(file)
--- 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
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.trust.gid import GID
from sfa.util.sfalogging import logger
-from sfa.util.py23 import StringType
class Record:
class Record:
@@
-49,18
+48,18
@@
class Record:
def exclude(k, v):
return k.startswith('_') or isinstance(v, exclude_types)
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):
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.ite
rite
ms():
+ for (k, v) in d.items():
# experimental
# experimental
- if isinstance(v,
StringType
) and v.lower() in ['true']:
+ if isinstance(v,
str
) and v.lower() in ['true']:
v = 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)
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):
# 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):
return fields
def save_as_xml(self):