[Python-checkins] gh-99341: Cover type ignore nodes when incrementing line numbers (GH-99422)

Tue Nov 22 06:06:32 EST 2022

https://github.com/python/cpython/commit/99e852c28fb7ba86aebbe6926b93eb2db8fd9a10
commit: 99e852c28fb7ba86aebbe6926b93eb2db8fd9a10
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022年11月22日T03:06:26-08:00
summary:
gh-99341: Cover type ignore nodes when incrementing line numbers (GH-99422)
(cherry picked from commit 1acdfec359fdf3db936168480be0f4157273c200)
Co-authored-by: Batuhan Taskaya <isidentical at gmail.com>
files:
A Misc/NEWS.d/next/Library/2022-11-13-02-06-56.gh-issue-99341.8-OlwB.rst
M Lib/ast.py
M Lib/test/test_ast.py

diff --git a/Lib/ast.py b/Lib/ast.py
index 6f235c2f2c67..4f5f9827146d 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -236,6 +236,12 @@ def increment_lineno(node, n=1):
 location in a file.
 """
 for child in walk(node):
+ # TypeIgnore is a special case where lineno is not an attribute
+ # but rather a field of the node itself.
+ if isinstance(child, TypeIgnore):
+ child.lineno = getattr(child, 'lineno', 0) + n
+ continue
+
 if 'lineno' in child._attributes:
 child.lineno = getattr(child, 'lineno', 0) + n
 if (
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 57b973509440..55a3e6b82c9c 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -914,6 +914,18 @@ def test_increment_lineno(self):
 self.assertEqual(ast.increment_lineno(src).lineno, 2)
 self.assertIsNone(ast.increment_lineno(src).end_lineno)
 
+ def test_increment_lineno_on_module(self):
+ src = ast.parse(dedent("""\
+ a = 1
+ b = 2 # type: ignore
+ c = 3
+ d = 4 # type: ignore at tag
+ """), type_comments=True)
+ ast.increment_lineno(src, n=5)
+ self.assertEqual(src.type_ignores[0].lineno, 7)
+ self.assertEqual(src.type_ignores[1].lineno, 9)
+ self.assertEqual(src.type_ignores[1].tag, '@tag')
+
 def test_iter_fields(self):
 node = ast.parse('foo()', mode='eval')
 d = dict(ast.iter_fields(node.body))
diff --git a/Misc/NEWS.d/next/Library/2022-11-13-02-06-56.gh-issue-99341.8-OlwB.rst b/Misc/NEWS.d/next/Library/2022-11-13-02-06-56.gh-issue-99341.8-OlwB.rst
new file mode 100644
index 000000000000..451561c579da
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-11-13-02-06-56.gh-issue-99341.8-OlwB.rst
@@ -0,0 +1,2 @@
+Fix :func:`ast.increment_lineno` to also cover :class:`ast.TypeIgnore` when
+changing line numbers.
