r1068@spiff: Fredrik | 2005-12-12 19:50:30 +0100

 assorted xml.etree tweaks

4 files changed, 19 insertions, 2 deletions

diff --git a/Doc/whatsnew/whatsnew25.tex b/Doc/whatsnew/whatsnew25.tex
index ee1683d..0b72f04 100644
--- a/Doc/whatsnew/whatsnew25.tex
+++ b/Doc/whatsnew/whatsnew25.tex
@@ -421,6 +421,12 @@ using the mode \code{'r|*'}.
 % patch 918101
 (Contributed by Lars Gust\"abel.)
 
+\item A new package \module{xml.etree} has been added, which contains
+a subset of the ElementTree XML library.  Available modules are
+\module{ElementTree}, \module{ElementPath}, and
+\module{ElementInclude}, from ElementTree 1.2.6. (Contributed by
+Fredrik Lundh.)
+
 \item The \module{xmlrpclib} module now supports returning 
       \class{datetime} objects for the XML-RPC date type.  Supply 
       \code{use_datetime=True} to the \function{loads()} function
@@ -437,6 +443,8 @@ using the mode \code{'r|*'}.
 
 % XXX new distutils features: upload
 
+% XXX should hashlib perhaps be described here instead?
+% XXX should xml.etree perhaps be described here instead?
 
 
 
diff --git a/Lib/test/xmltests.py b/Lib/test/xmltests.py
index 7963035..ced670b 100644
--- a/Lib/test/xmltests.py
+++ b/Lib/test/xmltests.py
@@ -15,5 +15,6 @@ def runtest(name):
 runtest("test.test_minidom")
 runtest("test.test_pyexpat")
 runtest("test.test_sax")
+runtest("test.test_xml_etree")
 runtest("test.test_xmllib")
 runtest("test.test_xmlrpc")
diff --git a/Lib/xml/__init__.py b/Lib/xml/__init__.py
index 827439f..dc82f74 100644
--- a/Lib/xml/__init__.py
+++ b/Lib/xml/__init__.py
@@ -1,6 +1,6 @@
 """Core XML support for Python.
 
-This package contains three sub-packages:
+This package contains four sub-packages:
 
 dom -- The W3C Document Object Model.  This supports DOM Level 1 +
        Namespaces.
@@ -10,10 +10,14 @@ parsers -- Python wrappers for XML parsers (currently only supports Expat).
 sax -- The Simple API for XML, developed by XML-Dev, led by David
        Megginson and ported to Python by Lars Marius Garshol.  This
        supports the SAX 2 API.
+
+etree -- The ElementTree XML library.  This is a subset of the full
+       ElementTree XML release.
+
 """
 
 
-__all__ = ["dom", "parsers", "sax"]
+__all__ = ["dom", "parsers", "sax", "etree"]
 
 # When being checked-out without options, this has the form
 # "<dollar>Revision: x.y </dollar>"
diff --git a/Misc/NEWS b/Misc/NEWS
index 691774f..d675706 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -292,6 +292,10 @@ Extension Modules
 Library
 -------
 
+- Added a subset of Fredrik Lundh's ElementTree package.  Available
+  modules are xml.etree.ElementTree, xml.etree.ElementPath, and
+  xml.etree.ElementInclude, from ElementTree 1.2.6.
+
 - Patch #1162825: Support non-ASCII characters in IDLE window titles.
 
 - Bug #1365984: urllib now opens "data:" URLs again.