CVS: Products/ParsedXML/DOM - ExpatBuilder.py:1.60

Martijn Faassen <[email protected]> Fri, 20 Dec 2002 10:29:59 -0500
Newsgroups gmane.comp.web.zope.parsed-xml
Message-ID <[email protected]>
Update of /cvs-repository/Products/ParsedXML/DOM
In directory cvs.zope.org:/tmp/cvs-serv11741/DOM

Modified Files:
	ExpatBuilder.py 
Log Message:
Updated CHANGES. Now uses xml.parsers.expat and not xml.parsers.pyexpat
as that's the canonical way to do it.


=== Products/ParsedXML/DOM/ExpatBuilder.py 1.59 => 1.60 ===
--- Products/ParsedXML/DOM/ExpatBuilder.py:1.59	Sun May 19 11:51:11 2002
+++ Products/ParsedXML/DOM/ExpatBuilder.py	Fri Dec 20 10:29:28 2002
@@ -112,7 +112,7 @@
 import Core
 import XMLExtended
 
-from xml.parsers import pyexpat
+from xml.parsers import expat
 
 
 class Options:
@@ -168,7 +168,7 @@
 
     def createParser(self):
         """Create a new parser object."""
-        return pyexpat.ParserCreate()
+        return expat.ParserCreate()
 
     def getParser(self):
         """Return the parser object, creating a new one if needed."""
@@ -385,8 +385,8 @@
         if not info:
             return
         type = info[0]
-        if type in (pyexpat.model.XML_CTYPE_ANY,
-                    pyexpat.model.XML_CTYPE_MIXED):
+        if type in (expat.model.XML_CTYPE_ANY,
+                    expat.model.XML_CTYPE_MIXED):
             return
         #
         # We have element type information; look for text nodes which
@@ -646,7 +646,7 @@
 
     def createParser(self):
         """Create a new namespace-handling parser."""
-        return pyexpat.ParserCreate(namespace_separator=" ")
+        return expat.ParserCreate(namespace_separator=" ")
 
     def install(self, parser):
         """Insert the namespace-handlers onto the parser."""