From: Tony Mack Date: Tue, 15 Nov 2011 03:29:27 +0000 (-0500) Subject: hasattr() second arg must be a string X-Git-Tag: sfa-1.1-3~12 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a46a2219f92cb2d54b95b411901f64138486e6cd hasattr() second arg must be a string --- diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py index 6f15d601..5789a9cc 100644 --- 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 -# 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: @@ -34,11 +33,8 @@ class Element(dict): 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 - @staticmethod def add_elements(xml, name, objs, fields=None): """