mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Do not clear globals or builtins when calling clear() on a frame object. Reverts behavior to that of 3.10 and earlier. (GH-26768)

Browse source
This commit is contained in:
Mark Shannon 2021-06-17 16:29:15 +01:00 • committed by GitHub
parent 00710e6346
commit ba2f32a983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_frame.py
View file

@ -45,6 +45,19 @@ class ClearTest(unittest.TestCase):
# The reference was released by .clear()
self.assertIs(None, wr())
def test_clear_does_not_clear_specials(self):
class C:
pass
c = C()
exc = self.outer(c=c)
del c
f = exc.__traceback__.tb_frame
f.clear()
self.assertIsNot(f.f_code, None)
self.assertIsNot(f.f_locals, None)
self.assertIsNot(f.f_builtins, None)
self.assertIsNot(f.f_globals, None)
def test_clear_generator(self):
endly = False
def g():

9
Objects/frameobject.c
View file

@ -612,7 +612,7 @@ frame_dealloc(PyFrameObject *f)
Py_TRASHCAN_SAFE_BEGIN(f)
PyCodeObject *co = f->f_code;
/* Kill all local variables */
/* Kill all local variables including specials. */
if (f->f_localsptr) {
for (int i = 0; i < co->co_nlocalsplus+FRAME_SPECIALS_SIZE; i++) {
Py_CLEAR(f->f_localsptr[i]);
@ -683,11 +683,10 @@ frame_tp_clear(PyFrameObject *f)
f->f_state = FRAME_CLEARED;
Py_CLEAR(f->f_trace);
PyCodeObject *co = f->f_code;
/* locals */
PyObject **localsplus = f->f_localsptr;
for (Py_ssize_t i = frame_nslots(f); --i >= 0; ++localsplus) {
Py_CLEAR(*localsplus);
for (int i = 0; i < co->co_nlocalsplus; i++) {
Py_CLEAR(f->f_localsptr[i]);
}
/* stack */