Skip to content

bpo-45324: Capture data in FrozenImporter.find_spec() to use in exec_module(). #28633

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
ericsnowcurrently merged 25 commits into from
Oct 5, 2021
Merged

bpo-45324: Capture data in FrozenImporter.find_spec() to use in exec_module(). #28633

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
97bdaa2
Make use of find_frozen() more consistent.
ericsnowcurrently Sep 29, 2021
e2e676d
Drop some one-off helper functions.
ericsnowcurrently Sep 29, 2021
6333212
Factor out unmarshal_frozen_code().
ericsnowcurrently Sep 29, 2021
8cd239b
Add a "data" arg to _imp.get_frozen_object().
ericsnowcurrently Sep 29, 2021
7724019
Add _imp.find_frozen().
ericsnowcurrently Sep 29, 2021
0dd3870
Use _imp.find_frozen() in the frozen importer.
ericsnowcurrently Sep 29, 2021
1a0ad16
Clear loader_state to save memory.
ericsnowcurrently Sep 29, 2021
fdf7689
Only call is_frozen() in the fallback case.
ericsnowcurrently Sep 29, 2021
385d412
Add a NEWS entry.
ericsnowcurrently Sep 29, 2021
e0fe501
Add a missing "static" declaration.
ericsnowcurrently Sep 29, 2021
7221e0e
Treat FROZEN_BAD_NAME as FROZEN_NOT_FOUND in some cases.
ericsnowcurrently Sep 29, 2021
5f68ee8
Make frozen_info.size Py_ssize_t.
ericsnowcurrently Sep 29, 2021
7b85a63
Py_ssize_t is never smaller than int.
ericsnowcurrently Sep 29, 2021
cdbc611
name -> nameobj.
ericsnowcurrently Sep 29, 2021
c6e70cc
Add tests.
ericsnowcurrently Sep 30, 2021
f86dcd5
Tweak the tests.
ericsnowcurrently Oct 1, 2021
d1b1868
Default to using _imp.get_frozen_object().
ericsnowcurrently Oct 1, 2021
4e105a9
Do not use <> to mark source package.
ericsnowcurrently Oct 1, 2021
5d6af1e
Drop unused code.
ericsnowcurrently Oct 1, 2021
017c932
Store data in loader_state directly.
ericsnowcurrently Oct 2, 2021
1a833ed
Set "name" on import errors.
ericsnowcurrently Oct 2, 2021
5363708
Use a narrower exception.
ericsnowcurrently Oct 2, 2021
07c947f
Fix a comment.
ericsnowcurrently Oct 2, 2021
cddf089
Clarify a comment.
ericsnowcurrently Oct 2, 2021
ca0500f
Add a note about why we silence an error.
ericsnowcurrently Oct 2, 2021
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 a comment.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 2, 2021
commit cddf0895396f8c8a1f92236691e854c94d3cedd2
3 changes: 3 additions & 0 deletions Lib/importlib/_bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,9 @@ def exec_module(module):
data = None
else:
# We clear the extra data we got from the finder, to save memory.

@brettcannon brettcannon Oct 1, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So the loader is one-time use? What happens if you call exec_module() again (e.g. importlib.reload())? Won't this break that?

@ericsnowcurrently ericsnowcurrently Oct 2, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It should work fine. If the data is set then the _imp.get_frozen_object() call in exec_module() will unmarshal that. If the data isn't set (e.g. with a reload) then get_frozen_object() will look up the frozen data, in addition to unmarshaling it.

@ericsnowcurrently ericsnowcurrently Oct 2, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I've added to that comment to clarify.

# Note that if this method is called again (e.g. by
# importlib.reload()) then _imp.get_frozen_object() will notice
# no data was provided and will look it up.
spec.loader_state = None
code = _call_with_frames_removed(_imp.get_frozen_object, name, data)
exec(code, module.__dict__)
Expand Down