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
hasattr() second arg must be a string
[sfa.git]
/
sfa
/
rspecs
/
elements
/
element.py
diff --git
a/sfa/rspecs/elements/element.py
b/sfa/rspecs/elements/element.py
index
6f15d60
..
5789a9c
100644
(file)
--- a/
sfa/rspecs/elements/element.py
+++ b/
sfa/rspecs/elements/element.py
@@
-20,9
+20,8
@@
class Element(dict):
"""
if not element_class:
element_class = Element
"""
if not element_class:
element_class = Element
-# xxx this obviously is wrong...
-# if not fields and hasattr(element_class, fields):
-# fields = element_class.fields
+ if not fields and hasattr(element_class, 'fields'):
+ fields = element_class.fields
elems = xml.xpath(xpath)
objs = []
for elem in elems:
elems = xml.xpath(xpath)
objs = []
for elem in elems:
@@
-34,11
+33,8
@@
class Element(dict):
if field in elem.attrib:
obj[field] = elem.attrib[field]
objs.append(obj)
if field in elem.attrib:
obj[field] = elem.attrib[field]
objs.append(obj)
-# xxx seems unused
- generic_elems = [element_class(elem.attrib, elem) for elem in elems]
return objs
return objs
-
@staticmethod
def add_elements(xml, name, objs, fields=None):
"""
@staticmethod
def add_elements(xml, name, objs, fields=None):
"""