Merged revisions 87876-87877 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r87876 | georg.brandl | 2011-01-09 08:38:51 +0100 (So, 09 Jan 2011) | 1 line
#10869: do not visit root node twice in ast.increment_lineno().
........
r87877 | georg.brandl | 2011-01-09 08:50:48 +0100 (So, 09 Jan 2011) | 1 line
Add missing line.
........
diff --git a/Lib/ast.py b/Lib/ast.py
index 0b8baf7..f8c4d3c 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -152,8 +152,6 @@
Increment the line number of each node in the tree starting at *node* by *n*.
This is useful to "move code" to a different location in a file.
"""
- if 'lineno' in node._attributes:
- node.lineno = getattr(node, 'lineno', 0) + n
for child in walk(node):
if 'lineno' in child._attributes:
child.lineno = getattr(child, 'lineno', 0) + n
@@ -204,9 +202,9 @@
def walk(node):
"""
- Recursively yield all child nodes of *node*, in no specified order. This is
- useful if you only want to modify nodes in place and don't care about the
- context.
+ Recursively yield all descendant nodes in the tree starting at *node*
+ (including *node* itself), in no specified order. This is useful if you
+ only want to modify nodes in place and don't care about the context.
"""
from collections import deque
todo = deque([node])