Skip to content

Commit 7088abe

Browse files
committed
[xmlparser] Replace outdated obj 'create' function
The XMLReader.parse_tag method contained leftover code from v1.3 value handling. The leftover 'create' functions were removed.
1 parent d276175 commit 7088abe

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

odml/tools/xmlparser.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ def parse_element(self, node):
223223
return None # won't be able to parse this one
224224
return getattr(self, "parse_" + node.tag)(node, self.tags[node.tag])
225225

226-
def parse_tag(self, root, fmt, insert_children=True, create=None):
226+
def parse_tag(self, root, fmt, insert_children=True):
227227
"""
228228
Parse an odml node based on the format description *fmt*
229-
and a function *create* to instantiate a corresponding object
229+
and instantiate the corresponding object.
230230
"""
231231
arguments = {}
232232
extra_args = {}
@@ -284,10 +284,9 @@ def parse_tag(self, root, fmt, insert_children=True, create=None):
284284
self.check_mandatory_arguments(dict(arguments.items() +
285285
extra_args.items()),
286286
fmt, root.tag, root)
287-
if create is None:
288-
obj = fmt.create()
289-
else:
290-
obj = create(args=arguments, text=''.join(text), children=children)
287+
288+
# Instantiate the current odML object with the parsed attributes.
289+
obj = fmt.create(**arguments)
291290

292291
for k, v in arguments.items():
293292
if hasattr(obj, k) and (getattr(obj, k) is None or k == 'id'):
@@ -312,12 +311,10 @@ def parse_odML(self, root, fmt):
312311
return doc
313312

314313
def parse_section(self, root, fmt):
315-
return self.parse_tag(root, fmt,
316-
create=lambda args, **kargs: fmt.create(**args))
314+
return self.parse_tag(root, fmt)
317315

318316
def parse_property(self, root, fmt):
319-
create = lambda children, args, **kargs: fmt.create(**args)
320-
return self.parse_tag(root, fmt, insert_children=False, create=create)
317+
return self.parse_tag(root, fmt, insert_children=False)
321318

322319

323320
if __name__ == '__main__':

0 commit comments

Comments
 (0)