Mercurial > libervia-backend

comparison src/tools/xml_tools.py @ 660:69a8bfd266a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core, plugins: fixed bad use of children instead of elements() for domish.Element instances.
author Goffi <goffi@goffi.org>
date Tue, 15 Oct 2013 19:28:34 +0200
parents 56f8a9c99194
children 969562c4761b
comparison
equal deleted inserted replaced
659:b6c22d9f593a 660:69a8bfd266a5
73 try: 73 try:
74 reported_elt = form_xml.elements('jabber:x:data', 'reported').next() 74 reported_elt = form_xml.elements('jabber:x:data', 'reported').next()
75 except StopIteration: 75 except StopIteration:
76 raise exceptions.DataError("Couldn't find expected <reported> tag") 76 raise exceptions.DataError("Couldn't find expected <reported> tag")
77 77
78 for elt in reported_elt.children: 78 for elt in reported_elt.elements():
79 if elt.name != "field": 79 if elt.name != "field":
80 raise exceptions.DataError("Unexpected tag") 80 raise exceptions.DataError("Unexpected tag")
81 name = elt["var"] 81 name = elt["var"]
82 label = elt.attributes.get('label','') 82 label = elt.attributes.get('label','')
83 type_ = elt.attributes.get('type','') # TODO 83 type_ = elt.attributes.get('type','') # TODO
88 88
89 item_elts = form_xml.elements('jabber:x:data', 'item') 89 item_elts = form_xml.elements('jabber:x:data', 'item')
90 90
91 for item_elt in item_elts: 91 for item_elt in item_elts:
92 fields = [] 92 fields = []
93 for elt in item_elt.children: 93 for elt in item_elt.elements():
94 if elt.name != 'field': 94 if elt.name != 'field':
95 warning("Unexpected tag (%s)" % elt.name) 95 warning("Unexpected tag (%s)" % elt.name)
96 continue 96 continue
97 name = elt['var'] 97 name = elt['var']
98 child_elt = elt.firstChildElement() 98 child_elt = elt.firstChildElement()