Update of /cvsroot/python/python/dist/src/Lib/xml/dom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21477/Lib/xml/dom Modified Files: Tag: release24-maint minidom.py Log Message: backport bug [ 1262320 ] minidom.py alternate newl support is broken Index: minidom.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/xml/dom/minidom.py,v retrieving revision 1.52 retrieving revision 1.52.4.1 diff -u -d -r1.52 -r1.52.4.1 --- minidom.py 12 Feb 2004 17:35:11 -0000 1.52 +++ minidom.py 25 Aug 2005 22:02:49 -0000 1.52.4.1 @@ -1278,15 +1278,15 @@ writer.write("<!DOCTYPE ") writer.write(self.name) if self.publicId: - writer.write("\n PUBLIC '%s'\n '%s'" - % (self.publicId, self.systemId)) + writer.write("%s PUBLIC '%s'%s '%s'" + % (newl, self.publicId, newl, self.systemId)) elif self.systemId: - writer.write("\n SYSTEM '%s'" % self.systemId) + writer.write("%s SYSTEM '%s'" % (newl, self.systemId)) if self.internalSubset is not None: writer.write(" [") writer.write(self.internalSubset) writer.write("]") - writer.write(">\n") + writer.write(">"+newl) class Entity(Identified, Node): attributes = None @@ -1739,9 +1739,9 @@ def writexml(self, writer, indent="", addindent="", newl="", encoding = None): if encoding is None: - writer.write('<?xml version="1.0" ?>\n') + writer.write('<?xml version="1.0" ?>'+newl) else: - writer.write('<?xml version="1.0" encoding="%s"?>\n' % encoding) + writer.write('<?xml version="1.0" encoding="%s"?>%s' % (encoding, newl)) for node in self.childNodes: node.writexml(writer, indent, addindent, newl)