[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24079: merge from 3.4
ned.deily
python-checkins at python.org
Tue Aug 18 04:16:45 CEST 2015
https://hg.python.org/cpython/rev/17ce3486fd8f
changeset: 97424:17ce3486fd8f
branch: 3.5
parent: 97420:948d8ea8e7a6
parent: 97423:ad0491f85050
user: Ned Deily <nad at acm.org>
date: Mon Aug 17 22:11:57 2015 -0400
summary:
Issue #24079: merge from 3.4
files:
Doc/library/xml.etree.elementtree.rst | 30 +++++++++-----
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -651,21 +651,29 @@
.. attribute:: text
+ tail
- The *text* attribute can be used to hold additional data associated with
- the element. As the name implies this attribute is usually a string but
- may be any application-specific object. If the element is created from
- an XML file the attribute will contain any text found between the element
- tags.
+ These attributes can be used to hold additional data associated with
+ the element. Their values are usually strings but may be any
+ application-specific object. If the element is created from
+ an XML file, the *text* attribute holds either the text between
+ the element's start tag and its first child or end tag, or ``None``, and
+ the *tail* attribute holds either the text between the element's
+ end tag and the next tag, or ``None``. For the XML data
+ .. code-block:: xml
- .. attribute:: tail
+ <a><b>1<c>2<d/>3</c></b>4</a>
- The *tail* attribute can be used to hold additional data associated with
- the element. This attribute is usually a string but may be any
- application-specific object. If the element is created from an XML file
- the attribute will contain any text found after the element's end tag and
- before the next tag.
+ the *a* element has ``None`` for both *text* and *tail* attributes,
+ the *b* element has *text* ``"1"`` and *tail* ``"4"``,
+ the *c* element has *text* ``"2"`` and *tail* ``None``,
+ and the *d* element has *text* ``None`` and *tail* ``"3"``.
+
+ To collect the inner text of an element, see :meth:`itertext`, for
+ example ``"".join(element.itertext())``.
+
+ Applications may store arbitrary objects in these attributes.
.. attribute:: attrib
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list