commit 93bbb6a9a641d54c242651e97948c15be911c9bb
author Ezio Melotti <ezio.melotti@gmail.com> Fri Nov 18 17:30:28 2011 +0200
committer Ezio Melotti <ezio.melotti@gmail.com> Fri Nov 18 17:30:28 2011 +0200
tree eb132cf7de83c92c47a54f72aeabb75c7e491ce7
parent ba41c6a1c3ed8b4f00703df8c9ed1d8ec73174c8

#4147: minidom's toprettyxml no longer adds whitespace around a text node when it is the only child of an element.  Initial patch by Dan Kenigsberg.

Lib/xml/dom/minidom.py

diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index a1f6f63..7e2898c 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -807,11 +807,15 @@
             writer.write("\"")
         if self.childNodes:
             writer.write(">")
-            if self.childNodes[0].nodeType != Node.TEXT_NODE:
+            if (len(self.childNodes) == 1 and
+                self.childNodes[0].nodeType == Node.TEXT_NODE):
+                self.childNodes[0].writexml(writer, '', '', '')
+            else:
                 writer.write(newl)
-            for node in self.childNodes:
-                node.writexml(writer,indent+addindent,addindent,newl)
-            writer.write("%s</%s>%s" % (indent,self.tagName,newl))
+                for node in self.childNodes:
+                    node.writexml(writer, indent+addindent, addindent, newl)
+                writer.write(indent)
+            writer.write("</%s>%s" % (self.tagName, newl))
         else:
             writer.write("/>%s"%(newl))
 
@@ -1033,7 +1037,7 @@
         return newText
 
     def writexml(self, writer, indent="", addindent="", newl=""):
-        _write_data(writer, self.data)
+        _write_data(writer, "%s%s%s" % (indent, self.data, newl))
 
     # DOM Level 3 (WD 9 April 2002)