[Python-checkins] cpython (merge 3.2 -> 3.3): Issue #11367: fix documentation of some find* methods in ElementTree

[eli.bendersky]

http://hg.python.org/cpython/rev/4012d4b41b2b
changeset:   82629:4012d4b41b2b
branch:      3.3
parent:      82625:fa051c6276a0
parent:      82628:958217164846
user:        Eli Bendersky <eliben at gmail.com>
date:        Tue Mar 12 06:04:33 2013 -0700
summary:
  Issue #11367: fix documentation of some find* methods in ElementTree

files:
  Lib/xml/etree/ElementTree.py |  11 ++++-------
  Misc/ACKS                    |   1 +
  2 files changed, 5 insertions(+), 7 deletions(-)


diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -692,8 +692,7 @@
         return list(self.iter(tag))
 
     ##
-    # Finds the first toplevel element with given tag.
-    # Same as getroot().find(path).
+    # Same as getroot().find(path), starting at the root of the tree.
     #
     # @param path What element to look for.
     # @keyparam namespaces Optional namespace prefix map.
@@ -713,10 +712,9 @@
         return self._root.find(path, namespaces)
 
     ##
-    # Finds the element text for the first toplevel element with given
-    # tag.  Same as getroot().findtext(path).
+    # Same as getroot().findtext(path), starting at the root of the tree.
     #
-    # @param path What toplevel element to look for.
+    # @param path What element to look for.
     # @param default What to return if the element was not found.
     # @keyparam namespaces Optional namespace prefix map.
     # @return The text content of the first matching element, or the
@@ -738,8 +736,7 @@
         return self._root.findtext(path, default, namespaces)
 
     ##
-    # Finds all toplevel elements with the given tag.
-    # Same as getroot().findall(path).
+    # Same as getroot().findall(path), starting at the root of the tree.
     #
     # @param path What element to look for.
     # @keyparam namespaces Optional namespace prefix map.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -480,6 +480,7 @@
 Rycharde Hawkes
 Ben Hayden
 Jochen Hayek
+Henrik Heimbuerger
 Christian Heimes
 Thomas Heller
 Malte Helmert

-- 
Repository URL: http://hg.python.org/cpython