[CalendarServer-changes] [9794] CalendarServer/trunk/txdav/xml/parser_etree.py

[source_changes at macosforge.org]

Revision: 9794
          http://trac.macosforge.org/projects/calendarserver/changeset/9794
Author:   cdaboo at apple.com
Date:     2012-09-08 14:59:01 -0700 (Sat, 08 Sep 2012)
Log Message:
-----------
Needed for Py2.6 compatibility.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/xml/parser_etree.py

Modified: CalendarServer/trunk/txdav/xml/parser_etree.py
===================================================================
--- CalendarServer/trunk/txdav/xml/parser_etree.py	2012-09-08 21:45:32 UTC (rev 9793)
+++ CalendarServer/trunk/txdav/xml/parser_etree.py	2012-09-08 21:59:01 UTC (rev 9794)
@@ -28,12 +28,17 @@
     "WebDAVDocument",
 ]
 
-from xml.etree.ElementTree import TreeBuilder, XMLParser, ParseError,\
+from xml.etree.ElementTree import TreeBuilder, XMLParser,\
     _namespace_map
 from txdav.xml.base import WebDAVUnknownElement, PCDATAElement
 from txdav.xml.base import _elements_by_qname
 from txdav.xml.parser_base import AbstractWebDAVDocument
 
+try:
+    from xml.etree.ElementTree import ParseError as XMLParseError
+except ImportError:
+    from xml.parsers.expat import ExpatError as XMLParseError
+
 def QNameSplit(qname):
     return tuple(qname[1:].split("}", 1)) if "}" in qname else ("", qname,)
 
@@ -147,7 +152,7 @@
                 if not data:
                     break
                 parser.feed(data)
-        except ParseError, e:
+        except XMLParseError, e:
             raise ValueError(e)
         return parser.close()
         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120908/c66f8cac/attachment.html>