Add correct formatting when writing on the XML.

app/gen2.py

@@ -33,9 +33,10 @@ def craftXmlMsgField(msg_field_data):
     msg_field.text=msg_field_data.description
     return msg_field
 
-
-def save_xml(root):
-    root.write(FILENAME, encoding='utf8')
+def save_xml(tree):
+    xmlstr = prettify(tree.getroot())
+    with open(FILENAME, "w") as f:
+        f.write(xmlstr)
 
 def deleteMsgFromXml(msg):
     tree = xml.parse(FILENAME)
@@ -55,7 +56,6 @@ def deleteEnumFromXml(enum):
             mav_enums.remove(mav_enum)
     save_xml(tree)
     
-    
 def addMsgToXml(msg):
     tree = xml.parse(FILENAME)
     mav_root = tree.getroot()
@@ -120,8 +120,9 @@ def prettify(elem):
     """Return a pretty-printed XML string for the Element.
     """
     rough_string = xml.tostring(elem, 'utf-8')
+    rough_string = rough_string.replace('\r', '').replace('\n', '')
     reparsed = minidom.parseString(rough_string)
-    return reparsed.toprettyxml(indent="\t")
+    return '\n'.join([line for line in reparsed.toprettyxml(indent='    ').split('\n') if line.strip()])
 
 def get_attr_if_exist(node,att_name):
     if att_name in node.attrib:
@@ -147,7 +148,7 @@ def get_enum():
         entrylist = []
         xmlEnumEntry = elem.findall("entry")
         for entry in xmlEnumEntry:
-            #print prettify(entry)
+            #-print prettify(entry)
             name =entry.get("name")
             desc = get_text_if_exist(entry,"description")
             value = entry.get("value")