Skip to content

GH-101673: Fix pdb bug that local variable changes lost after longlist #101674

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

Merged
iritkatriel merged 7 commits into from
Mar 12, 2023
+32 −11
Merged

GH-101673: Fix pdb bug that local variable changes lost after longlist #101674

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3acb643
Use f_code.co_name for module frame checking
gaogaotiantian Feb 8, 2023
6cfbe7c
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 9, 2023
bb2d818
Update 2023-02-09-19-40-41.gh-issue-101673.mX-Ppq.rst
gaogaotiantian Feb 9, 2023
121e00b
Add regression test for the bug
gaogaotiantian Mar 12, 2023
5724f3f
Use inspect.getsourcelines directly
gaogaotiantian Mar 12, 2023
ef602d8
tweak news
iritkatriel Mar 12, 2023
8b9fc42
Merge branch 'main' into fix-issue-101673
iritkatriel Mar 12, 2023
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
Prev Previous commit
Next Next commit
Use inspect.getsourcelines directly
  • Loading branch information
@gaogaotiantian
gaogaotiantian committed Mar 12, 2023
commit 5724f3fd25bbaba40f636a5f72740c680139274e
13 changes: 2 additions & 11 deletions Lib/pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@ def find_function(funcname, filename):
return funcname, filename, lineno
return None

def getsourcelines(obj):
lines, lineno = inspect.findsource(obj)
if inspect.isframe(obj) and obj.f_code.co_name == "<module>":
# must be a module frame: do not try to cut a block out of it
return lines, 1
elif inspect.ismodule(obj):
return lines, 1
return inspect.getblock(lines[lineno:]), lineno+1

def lasti2lineno(code, lasti):
linestarts = list(dis.findlinestarts(code))
linestarts.reverse()
Expand Down Expand Up @@ -1357,7 +1348,7 @@ def do_longlist(self, arg):
filename = self.curframe.f_code.co_filename
breaklist = self.get_file_breaks(filename)
try:
lines, lineno = getsourcelines(self.curframe)
lines, lineno = inspect.getsourcelines(self.curframe)
except OSError as err:
self.error(err)
return
Expand All @@ -1373,7 +1364,7 @@ def do_source(self, arg):
except:
return
try:
lines, lineno = getsourcelines(obj)
lines, lineno = inspect.getsourcelines(obj)
except (OSError, TypeError) as err:
self.error(err)
return
Expand Down