[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3
eli.bendersky
python-checkins at python.org
Tue Oct 9 15:47:32 CEST 2012
http://hg.python.org/cpython/rev/5cb3c08997e6
changeset: 79622:5cb3c08997e6
parent: 79620:d3c4dcd9a048
parent: 79621:79231a12567a
user: Eli Bendersky <eliben at gmail.com>
date: Tue Oct 09 06:47:23 2012 -0700
summary:
Merge 3.3
Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches.
files:
Doc/library/xml.etree.elementtree.rst | 6 ++++--
1 files changed, 4 insertions(+), 2 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
@@ -291,7 +291,9 @@
| | current element. For example, ``.//egg`` selects |
| | all ``egg`` elements in the entire tree. |
+-----------------------+------------------------------------------------------+
-| ``..`` | Selects the parent element. |
+| ``..`` | Selects the parent element. Returns ``None`` if the |
+| | path attempts to reach the ancestors of the start |
+| | element (the element ``find`` was called on). |
+-----------------------+------------------------------------------------------+
| ``[@attrib]`` | Selects all elements that have the given attribute. |
+-----------------------+------------------------------------------------------+
@@ -521,7 +523,7 @@
.. method:: clear()
Resets an element. This function removes all subelements, clears all
- attributes, and sets the text and tail attributes to None.
+ attributes, and sets the text and tail attributes to ``None``.
.. method:: get(key, default=None)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list