merge #4147: minidom's toprettyxml no longer adds whitespace to text nodes.
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 533258c..0a60136 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -467,6 +467,13 @@
dom.unlink()
self.confirm(domstr == str.replace("\n", "\r\n"))
+ def test_toPrettyXML_perserves_content_of_text_node(self):
+ str = '<A>B</A>'
+ dom = parseString(str)
+ dom2 = parseString(dom.toprettyxml())
+ self.assertEqual(dom.childNodes[0].childNodes[0].toxml(),
+ dom2.childNodes[0].childNodes[0].toxml())
+
def testProcessingInstruction(self):
dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
pi = dom.documentElement.firstChild
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 218c62e..386494d 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -836,7 +836,9 @@
_write_data(writer, attrs[a_name].value)
writer.write("\"")
if self.childNodes:
- writer.write(">%s"%(newl))
+ writer.write(">")
+ if self.childNodes[0].nodeType != Node.TEXT_NODE:
+ writer.write(newl)
for node in self.childNodes:
node.writexml(writer,indent+addindent,addindent,newl)
writer.write("%s</%s>%s" % (indent,self.tagName,newl))
@@ -1061,7 +1063,7 @@
return newText
def writexml(self, writer, indent="", addindent="", newl=""):
- _write_data(writer, "%s%s%s"%(indent, self.data, newl))
+ _write_data(writer, self.data)
# DOM Level 3 (WD 9 April 2002)
diff --git a/Misc/ACKS b/Misc/ACKS
index bc5e745..9d7e32b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -496,6 +496,7 @@
Hiroaki Kawai
Sebastien Keim
Ryan Kelly
+Dan Kenigsberg
Robert Kern
Randall Kern
Magnus Kessler
diff --git a/Misc/NEWS b/Misc/NEWS
index e07e3a7..822594c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -294,6 +294,8 @@
Library
-------
+- Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes.
+
- Issue #13034: When decoding some SSL certificates, the subjectAltName
extension could be unreported.