[Python-checkins] r46129 - python/trunk/Objects/frameobject.c
richard.jones
python-checkins at python.org
Tue May 23 20:32:12 CEST 2006
Author: richard.jones
Date: Tue May 23 20:32:11 2006
New Revision: 46129
Modified:
python/trunk/Objects/frameobject.c
Log:
fix broken merge
Modified: python/trunk/Objects/frameobject.c
==============================================================================
--- python/trunk/Objects/frameobject.c (original)
+++ python/trunk/Objects/frameobject.c Tue May 23 20:32:11 2006
@@ -362,8 +362,7 @@
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 @@
}
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;
More information about the Python-checkins
mailing list