Commit68e4129

authored

gh-83035: handle decorator with nested parens in inspect.getsource (#99654)

1 parentb11a384 commit68e4129Copy full SHA for 68e4129

File tree

+22

-9

lines changed

+22

-9

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,6 @@ def __init__(self):`
`1160`	`1160`	`self.started=False`
`1161`	`1161`	`self.passline=False`
`1162`	`1162`	`self.indecorator=False`
`1163`		`-self.decoratorhasargs=False`
`1164`	`1163`	`self.last=1`
`1165`	`1164`	`self.body_col0=None`
`1166`	`1165`
`@@ -1175,21 +1174,14 @@ def tokeneater(self, type, token, srowcol, erowcol, line):`
`1175`	`1174`	`self.islambda=True`
`1176`	`1175`	`self.started=True`
`1177`	`1176`	`self.passline=True# skip to the end of the line`
`1178`		`-eliftoken=="(":`
`1179`		`-ifself.indecorator:`
`1180`		`-self.decoratorhasargs=True`
`1181`		`-eliftoken==")":`
`1182`		`-ifself.indecorator:`
`1183`		`-self.indecorator=False`
`1184`		`-self.decoratorhasargs=False`
`1185`	`1177`	`eliftype==tokenize.NEWLINE:`
`1186`	`1178`	`self.passline=False# stop skipping when a NEWLINE is seen`
`1187`	`1179`	`self.last=srowcol[0]`
`1188`	`1180`	`ifself.islambda:# lambdas always end at the first NEWLINE`
`1189`	`1181`	`raiseEndOfBlock`
`1190`	`1182`	`# hitting a NEWLINE when in a decorator without args`
`1191`	`1183`	`# ends the decorator`
`1192`		`-ifself.indecoratorandnotself.decoratorhasargs:`
	`1184`	`+ifself.indecorator:`
`1193`	`1185`	`self.indecorator=False`
`1194`	`1186`	`elifself.passline:`
`1195`	`1187`	`pass`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -259,3 +259,17 @@ def all_markers_with_args_and_kwargs(a, b, /, c, d, args, e, f, *kwargs):`
`259`	`259`	`#line 259`
`260`	`260`	`defall_markers_with_defaults(a,b=1,/,c=2,d=3,*,e=4,f=5):`
`261`	`261`	`pass`
	`262`	`+`
	`263`	`+# line 263`
	`264`	`+defdeco_factory(**kwargs):`
	`265`	`+defdeco(f):`
	`266`	`+@wraps(f)`
	`267`	`+defwrapper(a,*kwd):`
	`268`	`+kwd.update(kwargs)`
	`269`	`+returnf(a,*kwd)`
	`270`	`+returnwrapper`
	`271`	`+returndeco`
	`272`	`+`
	`273`	`+@deco_factory(foo=(1+2),bar=lambda:1)`
	`274`	`+defcomplex_decorated(foo=0,bar=lambda:0):`
	`275`	`+returnfoo+bar()`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -886,6 +886,12 @@ def test_class(self):`
`886`	`886`	`self.assertSourceEqual(self.fodderModule.X,1,2)`
`887`	`887`
`888`	`888`
	`889`	`+classTestComplexDecorator(GetSourceBase):`
	`890`	`+fodderModule=mod2`
	`891`	`+`
	`892`	`+deftest_parens_in_decorator(self):`
	`893`	`+self.assertSourceEqual(self.fodderModule.complex_decorated,273,275)`
	`894`	`+`
`889`	`895`	`class_BrokenDataDescriptor(object):`
`890`	`896`	`"""`
`891`	`897`	`A broken data descriptor. See bug #1785.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:func:`inspect.getsource` handling of decorator calls with nested parentheses.

Comments

(0)