Skip to content

gh-137477: Extend regex pattern check in inspect.findsource #137479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

gh-137477: Extend regex pattern check in inspect.findsource #137479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ffaf0
test: Add failing generator test for inspect.getsourcelines
George-Ogden Aug 6, 2025
05abdb9
fix: Extend definition regex to include class (fix #137477)
George-Ogden Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,15 @@ def findsource(object):
lnum = object.co_firstlineno - 1
if lnum >= len(lines):
raise OSError('lineno is out of bounds')
pat = re.compile(r'^(\s*def\s)|(\s*class\s)|(\s*async\s+def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
while lnum > 0:
try:
line = lines[lnum]
except IndexError:
raise OSError('lineno is out of bounds')
if pat.match(line):
break
lnum = lnum - 1
return lines, lnum
raise OSError('could not find code object')

Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_inspect/inspect_fodder2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,3 +369,11 @@ class dc364:
# line 369
dc370 = dataclasses.make_dataclass('dc370', (('x', int), ('y', int)))
dc371 = dataclasses.make_dataclass('dc370', (('x', int), ('y', int)), module=__name__)

# line 373
from inspect import currentframe
def generator_frame():
loops = (
currentframe() for _ in [0]
)
return list(loops)[0]
5 changes: 5 additions & 0 deletions Lib/test/test_inspect/test_inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,11 @@ def test_class_definition_same_name_diff_methods(self):
self.assertSourceEqual(mod2.cls296, 296, 298)
self.assertSourceEqual(mod2.cls310, 310, 312)

def test_generator_frame(self):
frame = mod2.generator_frame()
assert frame is not None
self.assertSourceEqual(frame, 375, 379)

class TestNoEOL(GetSourceBase):
def setUp(self):
self.tempdir = TESTFN + '_dir'
Expand Down
Loading