Skip to content

bpo-21736: Set __file__ on frozen stdlib modules. #28656

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 18 commits into from
Oct 14, 2021
Merged

bpo-21736: Set __file__ on frozen stdlib modules. #28656

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5c538f5
Set __file__ on frozen modules if possible.
ericsnowcurrently Sep 29, 2021
62e3c16
Set __file__ based on "origname".
ericsnowcurrently Sep 29, 2021
6aaba14
Fix it
ericsnowcurrently Oct 1, 2021
f4d6db6
Fix up early-imported frozen modules.
ericsnowcurrently Sep 30, 2021
d8e19e0
Add a NEWS entry.
ericsnowcurrently Oct 1, 2021
ac5b7c1
Drop an unncessary comment.
ericsnowcurrently Oct 5, 2021
79c1035
Make sure frozen modules are fixed up properly.
ericsnowcurrently Oct 5, 2021
322cfd1
Return a memoryview from _imp.find_frozen().
ericsnowcurrently Oct 12, 2021
4f5160e
Use PyObject_GetBuffer() in _imp.get_frozen_object().
ericsnowcurrently Oct 13, 2021
dc152db
Stop storing the marshaled data in spec.loader_state.
ericsnowcurrently Oct 13, 2021
9687202
Empty initializers are not allowed.
ericsnowcurrently Oct 13, 2021
3685dd2
Keep _set_fileattr False if there is no location.
ericsnowcurrently Oct 14, 2021
549d395
Drop some unnecessary uses of "state".
ericsnowcurrently Oct 14, 2021
1decabf
Make an assertion more precise.
ericsnowcurrently Oct 14, 2021
4d47f30
Move a TODO comment.
ericsnowcurrently Oct 14, 2021
d6eea90
All modules without "origname" in _fix_up_module().
ericsnowcurrently Oct 14, 2021
866fdad
Add a comment about why we don't preserve the data in find_spec().
ericsnowcurrently Oct 14, 2021
5cba3d1
Fix a typo in a comment.
ericsnowcurrently Oct 14, 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
Use PyObject_GetBuffer() in _imp.get_frozen_object().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 13, 2021
commit 4f5160ed135e167a44f70fb909081f176f54d658
21 changes: 12 additions & 9 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,14 +2118,13 @@ _imp_get_frozen_object_impl(PyObject *module, PyObject *name,
/*[clinic end generated code: output=54368a673a35e745 input=034bdb88f6460b7b]*/
{
struct frozen_info info = {};
if (PyBytes_Check(dataobj)) {
info.data = PyBytes_AS_STRING(dataobj);
info.size = PyBytes_Size(dataobj);
}
else if (PyMemoryView_Check(dataobj)) {
Py_buffer *buf = PyMemoryView_GET_BUFFER(dataobj);
info.data = (const char *)buf->buf;
info.size = buf->len;
Py_buffer buf = {};
if (PyObject_CheckBuffer(dataobj)) {
if (PyObject_GetBuffer(dataobj, &buf, PyBUF_READ) != 0) {
return NULL;
}
info.data = (const char *)buf.buf;
info.size = buf.len;
}
else if (dataobj != Py_None) {
_PyArg_BadArgument("get_frozen_object", "argument 2", "bytes", dataobj);
Expand All @@ -2147,7 +2146,11 @@ _imp_get_frozen_object_impl(PyObject *module, PyObject *name,
return NULL;
}

return unmarshal_frozen_code(&info);
PyObject *codeobj = unmarshal_frozen_code(&info);
if (dataobj != Py_None) {
PyBuffer_Release(&buf);
}
return codeobj;
}

/*[clinic input]
Expand Down