Commit08738ce

and

authored

[3.14]gh-139783: Fix inspect.getsourcelines() for the case when a decorator is followed by a comment or an empty line (GH-139836) (GH-139889)

(cherry picked from commitf4104f5)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent5d34830 commit08738ceCopy full SHA for 08738ce

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1065,7 +1065,9 @@ def __init__(self):`
`1065`	`1065`
`1066`	`1066`	`deftokeneater(self,type,token,srowcol,erowcol,line):`
`1067`	`1067`	`ifnotself.startedandnotself.indecorator:`
`1068`		`-iftype==tokenize.INDENTortoken=="async":`
	`1068`	`+iftypein (tokenize.INDENT,tokenize.COMMENT,tokenize.NL):`
	`1069`	`+pass`
	`1070`	`+eliftoken=="async":`
`1069`	`1071`	`pass`
`1070`	`1072`	`# skip any decorators`
`1071`	`1073`	`eliftoken=="@":`

Lines changed: 12 additions & 0 deletions

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1223,6 +1223,10 @@ def test_generator_expression(self):`
`1223`	`1223`	`self.assertSourceEqual(next(mod2.ge377),377,380)`
`1224`	`1224`	`self.assertSourceEqual(next(mod2.func383()),385,388)`
`1225`	`1225`
	`1226`	`+deftest_comment_or_empty_line_after_decorator(self):`
	`1227`	`+self.assertSourceEqual(mod2.func394,392,395)`
	`1228`	`+self.assertSourceEqual(mod2.func400,398,401)`
	`1229`	`+`
`1226`	`1230`
`1227`	`1231`	`classTestNoEOL(GetSourceBase):`
`1228`	`1232`	`defsetUp(self):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix:func:`inspect.getsourcelines` for the case when a decorator is followed
	`2`	`+by a comment or an empty line.`

Comments

(0)