diff options
| author | Richard Jones <richard@commonground.com.au> | 2006-05-23 18:32:11 (GMT) |
|---|---|---|
| committer | Richard Jones <richard@commonground.com.au> | 2006-05-23 18:32:11 (GMT) |
| commit | a372711fcc2941488a4b28809350e4498913438a (patch) | |
| tree | 268bd37ebe40f4c46315823c4af37309bced17c8 /Objects | |
| parent | cebbefc98dd7b30ae8c5f7640951e247ece49991 (diff) | |
| download | cpython-a372711fcc2941488a4b28809350e4498913438a.zip cpython-a372711fcc2941488a4b28809350e4498913438a.tar.gz cpython-a372711fcc2941488a4b28809350e4498913438a.tar.bz2 | |
fix broken merge
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/frameobject.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 0803957..fcb5e4e 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -362,8 +362,7 @@ static PyGetSetDef frame_getsetlist[] = { In zombie mode, no field of PyFrameObject holds a reference, but the following fields are still valid: - * ob_type, ob_size, f_code, f_valuestack, - f_nlocals, f_ncells, f_nfreevars, f_stacksize; + * ob_type, ob_size, f_code, f_valuestack; * f_locals, f_trace, f_exc_type, f_exc_value, f_exc_traceback are NULL; @@ -629,11 +628,7 @@ PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals, } f->f_code = code; - f->f_nlocals = code->co_nlocals; - f->f_stacksize = code->co_stacksize; - f->f_ncells = ncells; - f->f_nfreevars = nfrees; - extras = f->f_nlocals + ncells + nfrees; + extras = code->co_nlocals + ncells + nfrees; f->f_valuestack = f->f_localsplus + extras; for (i=0; i<extras; i++) f->f_localsplus[i] = NULL; |