[xmlparser] Code cleanup

Author: mpsonntag

odml/tools/xmlparser.py

@@ -5,11 +5,11 @@
     python -m odml.tools.xmlparser file.odml
 """
 import csv
+import sys
 from lxml import etree as ET
 from lxml.builder import E
 # this is needed for py2exe to include lxml completely
 from lxml import _elementpath as _dummy
-import sys
 
 try:
     from StringIO import StringIO
@@ -118,10 +118,9 @@ def write_file(self, filename):
         else:
             data = str(self)
 
-        f = open(filename, "w")
-        f.write(self.header)
-        f.write(data)
-        f.close()
+        with open(filename, "w") as file:
+            file.write(self.header)
+            file.write(data)
 
 
 def load(filename):
@@ -260,8 +259,6 @@ def parse_tag(self, root, fmt, insert_children=True):
                 else:
                     tag = fmt.map(node.tag)
                     if tag in arguments:
-                        # TODO make this an error, however first figure out a
-                        # way to let <odML version=><version/> pass
                         self.warn("Element <%s> is given multiple times in "
                                   "<%s> tag" % (node.tag, root.tag), node)
 
@@ -277,20 +274,19 @@ def parse_tag(self, root, fmt, insert_children=True):
                            % (node.tag, root.tag), node)
 
         if sys.version_info > (3,):
-            self.check_mandatory_arguments(dict(list(arguments.items()) +
-                                           list(extra_args.items())),
-                                           fmt, root.tag, root)
+            check_args = dict(list(arguments.items()) + list(extra_args.items()))
         else:
-            self.check_mandatory_arguments(dict(arguments.items() +
-                                           extra_args.items()),
-                                           fmt, root.tag, root)
+            check_args = dict(arguments.items() + extra_args.items())
+
+        self.check_mandatory_arguments(check_args, fmt, root.tag, root)
 
         # Instantiate the current odML object with the parsed attributes.
         obj = fmt.create(**arguments)
 
         if insert_children:
             for child in children:
                 obj.append(child)
+
         return obj
 
     def parse_odML(self, root, fmt):