[CalendarServer-changes] [8887] CalendarServer/trunk/txdav/xml
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 16 03:02:07 PDT 2012
Revision: 8887
http://trac.macosforge.org/projects/calendarserver/changeset/8887
Author: wsanchez at apple.com
Date: 2012-03-16 03:02:06 -0700 (Fri, 16 Mar 2012)
Log Message:
-----------
Nix twext.util.PrintXML
Modified Paths:
--------------
CalendarServer/trunk/txdav/xml/parser.py
CalendarServer/trunk/txdav/xml/util.py
Modified: CalendarServer/trunk/txdav/xml/parser.py
===================================================================
--- CalendarServer/trunk/txdav/xml/parser.py 2012-03-16 09:19:11 UTC (rev 8886)
+++ CalendarServer/trunk/txdav/xml/parser.py 2012-03-16 10:02:06 UTC (rev 8887)
@@ -40,7 +40,7 @@
import xml.sax
from txdav.xml.base import WebDAVElement, WebDAVUnknownElement, PCDATAElement
-from txdav.xml.util import PrintXML
+from txdav.xml.xmlext import Print as xmlPrint
##
# Parsing
@@ -263,7 +263,8 @@
def writeXML(self, output):
document = xml.dom.minidom.Document()
self.root_element.addToDOM(document, None)
- PrintXML(document, stream=output)
+ #document.normalize()
+ xmlPrint(document, output)
def toxml(self):
output = StringIO.StringIO()
Modified: CalendarServer/trunk/txdav/xml/util.py
===================================================================
--- CalendarServer/trunk/txdav/xml/util.py 2012-03-16 09:19:11 UTC (rev 8886)
+++ CalendarServer/trunk/txdav/xml/util.py 2012-03-16 10:02:06 UTC (rev 8887)
@@ -34,18 +34,6 @@
]
-def PrintXML(document, stream):
- try:
- import xml.dom.ext as ext
- except ImportError:
- import txdav.xml.xmlext as ext
-
- document.normalize()
- ext.Print(document, stream)
- # For debugging, this is easier to read: (FIXME: disable for normal use)
- #ext.PrettyPrint(document, stream)
-
-
def encodeXMLName(namespace, name):
"""
Encodes an XML namespace and name into a UTF-8 string.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120316/f236a170/attachment.html>
More information about the calendarserver-changes
mailing list