CVS: Products/ParsedXML - CHANGES.txt:1.17 ManageableDOM.py:1.111 ParsedXML.py:1.43 version.txt:1.5

Update of /cvs-repository/Products/ParsedXML
In directory cvs.zope.org:/tmp/cvs-serv11741

Modified Files:
	CHANGES.txt ManageableDOM.py ParsedXML.py version.txt 
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/CHANGES.txt 1.16 => 1.17 ===
--- Products/ParsedXML/CHANGES.txt:1.16	Thu Dec 19 14:22:25 2002
+++ Products/ParsedXML/CHANGES.txt	Fri Dec 20 10:29:28 2002
@@ -12,6 +12,9 @@
 
       - The Zope Find tab should now not give an error anymore when searching
         with ids.
+
+      - Use the One True Way to import expat now ('from xml.parsers
+        import expat').
   
   ParsedXML 1.3.0
 


=== Products/ParsedXML/ManageableDOM.py 1.110 => 1.111 ===
--- Products/ParsedXML/ManageableDOM.py:1.110	Thu Dec 19 14:21:36 2002
+++ Products/ParsedXML/ManageableDOM.py	Fri Dec 20 10:29:28 2002
@@ -100,7 +100,7 @@
 import ExtraDOM
 
 import string
-from xml.parsers import pyexpat
+from xml.parsers import expat
 
 import xml.dom
 import types
@@ -495,7 +495,7 @@
         text=StringIO(data)
         try:
             newNode = self.parseXML(text) # self not in doc if this succeeds
-        except pyexpat.error, e:
+        except expat.error, e:
             get_transaction().abort()
             if REQUEST:
                 dataOut = self.makeErrorOutput(data, e.offset, e.lineno)
@@ -518,7 +518,7 @@
         "Parse the given file and handle the result."
         try:
             newNode = self.parseXML(file)
-        except pyexpat.error, e:
+        except expat.error, e:
             get_transaction().abort()
             if REQUEST:
                 file.seek(0)


=== Products/ParsedXML/ParsedXML.py 1.42 => 1.43 ===
--- Products/ParsedXML/ParsedXML.py:1.42	Thu May 16 18:13:00 2002
+++ Products/ParsedXML/ParsedXML.py	Fri Dec 20 10:29:28 2002
@@ -96,7 +96,7 @@
 from ManageableDOM import ManageableDocument, DOMManageable, \
      theDOMImplementation
 from StrIO import StringIO
-from xml.parsers import pyexpat
+from xml.parsers import expat
 import DOM, ExtraDOM
 
 from types import FileType, StringType
@@ -119,7 +119,7 @@
         file ='<?xml version = "1.0"?><emptydocumentElement/>'
     try:
         ob = ParsedXML(id, file, useNamespaces, contentType)
-    except pyexpat.error, e:
+    except expat.error, e:
         if REQUEST is not None:
             err = "%s%s" % (parserr, '<font color="red">%s</font>'
                             % getattr(e, 'args', ''))


=== Products/ParsedXML/version.txt 1.4 => 1.5 ===
--- Products/ParsedXML/version.txt:1.4	Thu May 16 18:28:36 2002
+++ Products/ParsedXML/version.txt	Fri Dec 20 10:29:28 2002
@@ -1 +1 @@
-ParsedXML 1.3.0
+ParsedXML 1.3.1