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
python3 - 2to3 + miscell obvious tweaks
[sfa.git]
/
sfa
/
rspecs
/
elements
/
element.py
diff --git
a/sfa/rspecs/elements/element.py
b/sfa/rspecs/elements/element.py
index
b288cbb
..
7dcfa00
100644
(file)
--- a/
sfa/rspecs/elements/element.py
+++ b/
sfa/rspecs/elements/element.py
@@
-2,15
+2,16
@@
class Element(dict):
fields = {}
fields = {}
- def __init__(self, fields={}, element=None, keys=None):
+ def __init__(self, fields=None, element=None, keys=None):
+ if fields is None:
+ fields = {}
self.element = element
dict.__init__(self, dict.fromkeys(self.fields))
if not keys:
self.element = element
dict.__init__(self, dict.fromkeys(self.fields))
if not keys:
- keys =
fields.keys(
)
+ keys =
list(fields.keys()
)
for key in keys:
if key in fields:
for key in keys:
if key in fields:
- self[key] = fields[key]
-
+ self[key] = fields[key]
def __getattr__(self, name):
if hasattr(self.__dict__, name):
def __getattr__(self, name):
if hasattr(self.__dict__, name):
@@
-18,4
+19,5
@@
class Element(dict):
elif hasattr(self.element, name):
return getattr(self.element, name)
else:
elif hasattr(self.element, name):
return getattr(self.element, name)
else:
- raise AttributeError, "class Element has not attribute %s" % name
+ raise AttributeError("class Element of type {} has no attribute {}"
+ .format(self.__class__.__name__, name))