mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-30167: Remove __cached__ from __main__ when removing __file__ (GH-7415)

Browse source
This commit is contained in:
INADA Naoki 2018-11-29 20:01:27 +09:00 • committed by GitHub
parent 9fbcfc08e5
commit 82daa60def
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst Normal file
View file

@ -0,0 +1,2 @@
``PyRun_SimpleFileExFlags`` removes ``__cached__`` from module in addition
to ``__file__``.

10
Python/pythonrun.c
View file

@ -434,8 +434,14 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
Py_DECREF(v); Py_DECREF(v);
ret = 0; ret = 0;
done: done:
if (set_file_name && PyDict_DelItemString(d, "__file__")) if (set_file_name) {
PyErr_Clear(); if (PyDict_DelItemString(d, "__file__")) {
PyErr_Clear();
}
if (PyDict_DelItemString(d, "__cached__")) {
PyErr_Clear();
}
}
Py_XDECREF(m); Py_XDECREF(m);
return ret; return ret;
} }