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

Sun Jan 9 08:53:14 CET 2011

Author: georg.brandl
Date: Sun Jan 9 08:53:14 2011
New Revision: 87879
Log:
Merged revisions 87876-87877 via svnmerge from 
svn+ssh://pythondev@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.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Doc/library/ast.rst
 python/branches/release27-maint/Lib/ast.py
 python/branches/release27-maint/Lib/test/test_ast.py
 python/branches/release27-maint/Misc/ACKS
 python/branches/release27-maint/Misc/NEWS
Modified: python/branches/release27-maint/Doc/library/ast.rst
==============================================================================

--- python/branches/release27-maint/Doc/library/ast.rst	(original)
+++ python/branches/release27-maint/Doc/library/ast.rst	Sun Jan 9 08:53:14 2011
@@ -187,9 +187,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/release27-maint/Lib/ast.py
==============================================================================
--- python/branches/release27-maint/Lib/ast.py	(original)
+++ python/branches/release27-maint/Lib/ast.py	Sun Jan 9 08:53:14 2011
@@ -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])
Modified: python/branches/release27-maint/Lib/test/test_ast.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_ast.py	(original)
+++ python/branches/release27-maint/Lib/test/test_ast.py	Sun Jan 9 08:53:14 2011
@@ -264,6 +264,14 @@
 'op=Add(), right=Num(n=1, lineno=4, col_offset=4), lineno=4, '
 'col_offset=0))'
 )
+ # issue10869: do not increment lineno of root twice
+ src = ast.parse('1 + 1', mode='eval')
+ 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/release27-maint/Misc/ACKS
==============================================================================
--- python/branches/release27-maint/Misc/ACKS	(original)
+++ python/branches/release27-maint/Misc/ACKS	Sun Jan 9 08:53:14 2011
@@ -848,6 +848,7 @@
 Rickard Westman
 Jeff Wheeler
 Christopher White
+David White
 Mats Wichmann
 Truida Wiedijk
 Felix Wiemann
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Jan 9 08:53:14 2011
@@ -36,6 +36,9 @@
 dependent, but ``time.mktime`` will now accept full range supported
 by the OS. Conversion of 2-digit years to 4-digit is deprecated.
 
+- Issue #10869: Fixed bug where ast.increment_lineno modified the root
+ node twice.
+
 - Issue #7858: Raise an error properly when os.utime() fails under Windows
 on an existing file.
 
