[Python-checkins] python/dist/src/Lib/xml/dom minidom.py, 1.48.2.2, 1.48.2.3

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/xml/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/Lib/xml/dom

Modified Files:
      Tag: ast-branch
	minidom.py 
Log Message:
Merge head to branch (for the last time)


Index: minidom.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/dom/minidom.py,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -d -r1.48.2.2 -r1.48.2.3
--- minidom.py	7 Jan 2005 06:59:21 -0000	1.48.2.2
+++ minidom.py	16 Oct 2005 05:24:01 -0000	1.48.2.3
@@ -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)