Skip to content

gh-83151: Make closure work on pdb #111094

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
brandtbucher merged 13 commits into from
May 6, 2024
Merged

gh-83151: Make closure work on pdb #111094

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
720a584
Make closure work on pdb
gaogaotiantian Oct 20, 2023
8232457
Always update local variables
gaogaotiantian Oct 20, 2023
8df6d2b
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 20, 2023
9c68aef
Merge branch 'main' into pdb-closure
gaogaotiantian May 4, 2024
fe5a6f6
Update the code for pep 667
gaogaotiantian May 5, 2024
cc21873
Remove blank line
gaogaotiantian May 5, 2024
d37b5a7
Merge branch 'main' into pdb-closure
gaogaotiantian May 5, 2024
cd46a05
Update 2023-10-20-03-50-17.gh-issue-83151.bcsD40.rst
gaogaotiantian May 5, 2024
d04bc5d
Merge branch 'main' into pdb-closure
gaogaotiantian May 5, 2024
aa91238
Fix test for breakpoint change
gaogaotiantian May 5, 2024
7650aa9
Apply suggestions from code review
gaogaotiantian May 6, 2024
3c44f88
Fix some typos in review and add exception check
gaogaotiantian May 6, 2024
18e7a16
Apply suggestions from code review
gaogaotiantian May 6, 2024
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
Apply suggestions from code review 
Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
  • Loading branch information
@gaogaotiantian @brandtbucher
gaogaotiantian and brandtbucher authored May 6, 2024
commit 7650aa95828b12dc285c7dfd7768824f43d81bfc
11 changes: 4 additions & 7 deletions Lib/pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,7 @@ def _exec_in_closure(self, source, globals, locals):
# Otherwise, we can just raise an exception and normal exec will be used.

code = compile(source, "<string>", "exec")
for const in code.co_consts:
if isinstance(const, CodeType):
break
else:
if any(isinstance(const, CodeType) for const in code.co_consts):
return False

# locals could be a proxy which does not support pop
Expand All @@ -665,7 +662,7 @@ def _exec_in_closure(self, source, globals, locals):
source = ("try:\n" +
textwrap.indent(source, " ") + "\n" +
"finally:\n" +
" __pdb_eval__['write_back'].update(locals())")
" __pdb_eval__['write_back'] = locals()")

local_vars = list(locals_copy.keys())
Comment thread
gaogaotiantian marked this conversation as resolved.
Outdated

Expand All @@ -687,7 +684,7 @@ def _exec_in_closure(self, source, globals, locals):
# Get the code object of __pdb_scope()
# The exec fills locals_copy with the __pdb_outer() function and we can call
# that to get the code object of __pdb_scope()
code = exec(source_with_closure, {}, locals_copy)
exec(source_with_closure, {}, locals_copy)
code = locals_copy.pop("__pdb_outer")()

cells = tuple(types.CellType(locals_copy.get(var)) for var in code.co_freevars)
Expand All @@ -698,7 +695,7 @@ def _exec_in_closure(self, source, globals, locals):
return False
Comment thread
brandtbucher marked this conversation as resolved.

# get the data we need from the statement
pdb_eval = locals_copy.pop("__pdb_eval__")
pdb_eval = locals_copy["__pdb_eval__]

# __pdb_eval__ should not be updated back to locals
pdb_eval["write_back"].pop("__pdb_eval__")
Comment thread
brandtbucher marked this conversation as resolved.
Expand Down