Skip to content

gh-93696: Locate frozen module source with __file__ #93697

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
JelleZijlstra merged 14 commits into from
Oct 25, 2022
Merged

gh-93696: Locate frozen module source with __file__ #93697

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c91afc1
Locate frozen module source with __file__
SnoopJ Jun 10, 2022
4baf238
Add NEWS entry
SnoopJ Jun 10, 2022
a9e9c7a
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Jun 12, 2022
ff51687
Add test for listing source for frozen modules
SnoopJ Jun 12, 2022
e58c4dc
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Jun 27, 2022
793f2bf
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Jul 15, 2022
e88d3a5
Add issue reference to frozen_list test
SnoopJ Jul 15, 2022
47eae63
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Jul 15, 2022
116c26b
Use assertIn() instead of assertTrue()
SnoopJ Jul 17, 2022
163f3df
Link to pdb module docs in news fragment
SnoopJ Jul 17, 2022
c716862
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Jul 17, 2022
55f2a0f
Clarify that gh-89815 is a superceding issue
SnoopJ Jul 22, 2022
3facf2f
Merge branch 'main' into gh-93696-pdb-find-frozen-source
SnoopJ Oct 24, 2022
a2589c9
Only apply filename workaround for string attribute
SnoopJ Oct 25, 2022
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
Clarify that gh-89815 is a superceding issue
  • Loading branch information
@SnoopJ
SnoopJ committed Jul 22, 2022
commit 55f2a0f0b317bec41196b7acaa6b717fc72ca57f
3 changes: 2 additions & 1 deletion Lib/pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,8 @@ def do_list(self, arg):
if last is None:
last = first + 10
filename = self.curframe.f_code.co_filename
# gh-93696: stdlib frozen modules provide a useful __file__ (see also gh-89815)
# gh-93696: stdlib frozen modules provide a useful __file__
# this workaround can be removed with the closure of gh-89815
if filename.startswith("<frozen"):
if "__file__" in self.curframe.f_globals:
filename = self.curframe.f_globals["__file__"]
Copy link
Member

@JelleZijlstra JelleZijlstra Oct 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if __file__ is not a string? It looks like get_file_breaks will crash in that case. We should probably just ignore __file__ in that case.

Copy link
Contributor Author

@SnoopJ SnoopJ Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, that's a good point. I would think it's a small edge, but it's easy to be more cautious about it.

Copy link
Member

@JelleZijlstra JelleZijlstra Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think it's important for a debugger to be resilient in the face of unusual program state.

Expand Down