Implement the encoding argument for toxml and toprettyxml.
Document toprettyxml.
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index cb2c4d2..33ad736 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -65,16 +65,22 @@
def __nonzero__(self):
return 1
- def toxml(self):
- writer = _get_StringIO()
- self.writexml(writer)
- return writer.getvalue()
+ def toxml(self, encoding = None):
+ return self.toprettyxml("", "", encoding)
- def toprettyxml(self, indent="\t", newl="\n"):
+ def toprettyxml(self, indent="\t", newl="\n", encoding = None):
# indent = the indentation string to prepend, per level
# newl = the newline string to append
writer = _get_StringIO()
- self.writexml(writer, "", indent, newl)
+ if encoding is not None:
+ import codecs
+ # Can't use codecs.getwriter to preserve 2.0 compatibility
+ writer = codecs.lookup(encoding)[3](writer)
+ if self.nodeType == Node.DOCUMENT_NODE:
+ # Can pass encoding only to document, to put it into XML header
+ self.writexml(writer, "", indent, newl, encoding)
+ else:
+ self.writexml(writer, "", indent, newl)
return writer.getvalue()
def hasChildNodes(self):
@@ -934,8 +940,12 @@
return _getElementsByTagNameNSHelper(self, namespaceURI, localName,
NodeList())
- def writexml(self, writer, indent="", addindent="", newl=""):
- writer.write('<?xml version="1.0" ?>\n')
+ def writexml(self, writer, indent="", addindent="", newl="",
+ encoding = None):
+ if encoding is None:
+ writer.write('<?xml version="1.0" ?>\n')
+ else:
+ writer.write('<?xml version="1.0" encoding="%s"?>\n' % encoding)
for node in self.childNodes:
node.writexml(writer, indent, addindent, newl)