[Python-checkins] r87876 - in python/branches/py3k: Doc/library/ast.rst Lib/ast.py Lib/test/test_ast.py Misc/ACKS Misc/NEWS

Sun Jan 9 08:38:52 CET 2011

Author: georg.brandl
Date: Sun Jan 9 08:38:51 2011
New Revision: 87876
Log:
#10869: do not visit root node twice in ast.increment_lineno().
Modified:
 python/branches/py3k/Doc/library/ast.rst
 python/branches/py3k/Lib/ast.py
 python/branches/py3k/Lib/test/test_ast.py
 python/branches/py3k/Misc/ACKS
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Doc/library/ast.rst
==============================================================================

--- python/branches/py3k/Doc/library/ast.rst	(original)
+++ python/branches/py3k/Doc/library/ast.rst	Sun Jan 9 08:38:51 2011
@@ -173,9 +173,9 @@
 
 .. function:: 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.
 
 
 .. class:: NodeVisitor()
Modified: python/branches/py3k/Lib/ast.py
==============================================================================
--- python/branches/py3k/Lib/ast.py	(original)
+++ python/branches/py3k/Lib/ast.py	Sun Jan 9 08:38:51 2011
@@ -159,8 +159,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
@@ -211,9 +209,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])
Modified: python/branches/py3k/Lib/test/test_ast.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ast.py	(original)
+++ python/branches/py3k/Lib/test/test_ast.py	Sun Jan 9 08:38:51 2011
@@ -264,6 +264,13 @@
 'op=Add(), right=Num(n=1, lineno=4, col_offset=4), lineno=4, '
 'col_offset=0))'
 )
+ # issue10869: do not increment lineno of root twice
+ self.assertEqual(ast.increment_lineno(src.body, n=3), src.body)
+ self.assertEqual(ast.dump(src, include_attributes=True),
+ 'Expression(body=BinOp(left=Num(n=1, lineno=4, col_offset=0), '
+ 'op=Add(), right=Num(n=1, lineno=4, col_offset=4), lineno=4, '
+ 'col_offset=0))'
+ )
 
 def test_iter_fields(self):
 node = ast.parse('foo()', mode='eval')
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Sun Jan 9 08:38:51 2011
@@ -905,6 +905,7 @@
 Rickard Westman
 Jeff Wheeler
 Christopher White
+David White
 Mats Wichmann
 Truida Wiedijk
 Felix Wiemann
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Jan 9 08:38:51 2011
@@ -40,6 +40,9 @@
 Library
 -------
 
+- Issue #10869: Fixed bug where ast.increment_lineno modified the root
+ node twice.
+
 - Issue #5871: email.header.Header.encode now raises an error if any
 continuation line in the formatted value has no leading white space
 and looks like a header. Since Generator uses Header to format all
