summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-01-22 20:50:06 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-01-22 20:50:06 (GMT)
commit605a95ae4403223fd6f62bcd313ce2ca72a9dbdb (patch)
treeeec15386adf0473c8c9b658d60345c5dd9280d4a
parent88069d217abc03ae2563f240b8f1e1fadd9f1acc (diff)
parent564e4d8dc9b918b5efaada336ab3bf595176d175 (diff)
downloadcpython-605a95ae4403223fd6f62bcd313ce2ca72a9dbdb.zip
cpython-605a95ae4403223fd6f62bcd313ce2ca72a9dbdb.tar.gz
cpython-605a95ae4403223fd6f62bcd313ce2ca72a9dbdb.tar.bz2
#11379: merge with 3.3.
-rw-r--r--Doc/library/xml.dom.minidom.rst22
-rw-r--r--Lib/xml/dom/minidom.py5
2 files changed, 11 insertions, 16 deletions
diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
index a5c6fb2..a75325f 100644
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -1,8 +1,8 @@
-:mod:`xml.dom.minidom` --- Lightweight DOM implementation
-=========================================================
+:mod:`xml.dom.minidom` --- Minimal DOM implementation
+=====================================================
.. module:: xml.dom.minidom
- :synopsis: Lightweight Document Object Model (DOM) implementation.
+ :synopsis: Minimal Document Object Model (DOM) implementation.
.. moduleauthor:: Paul Prescod <paul@prescod.net>
.. sectionauthor:: Paul Prescod <paul@prescod.net>
.. sectionauthor:: Martin v. Löwis <martin@v.loewis.de>
@@ -11,17 +11,11 @@
--------------
-:mod:`xml.dom.minidom` is a light-weight implementation of the Document Object
-Model interface. It is intended to be simpler than the full DOM and also
-significantly smaller.
-
-.. note::
-
- The :mod:`xml.dom.minidom` module provides an implementation of the W3C-DOM,
- with an API similar to that in other programming languages. Users who are
- unfamiliar with the W3C-DOM interface or who would like to write less code
- for processing XML files should consider using the
- :mod:`xml.etree.ElementTree` module instead.
+:mod:`xml.dom.minidom` is a minimal implementation of the Document Object
+Model interface, with an API similar to that in other languages. It is intended
+to be simpler than the full DOM and also significantly smaller. Users who are
+not already proficient with the DOM should consider using the
+:mod:`xml.etree.ElementTree` module for their XML processing instead
DOM applications typically start by parsing some XML into a DOM. With
:mod:`xml.dom.minidom`, this is done through the parse functions::
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 28e5030..55c4ce1 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -1,5 +1,6 @@
-"""\
-minidom.py -- a lightweight DOM implementation.
+"""Simple implementation of the Level 1 DOM.
+
+Namespaces and other minor Level 2 features are also supported.
parse("foo.xml")