[Python-checkins] python/dist/src/Objects frameobject.c,2.59.6.2,2.59.6.3
jhylton@sourceforge.net
jhylton@sourceforge.net
2002年4月19日 22:07:07 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv2588
Modified Files:
Tag: release22-maint
frameobject.c
Log Message:
backport fix for SF buf #505315 from trunk
Index: frameobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/frameobject.c,v
retrieving revision 2.59.6.2
retrieving revision 2.59.6.3
diff -C2 -d -r2.59.6.2 -r2.59.6.3
*** frameobject.c 13 Apr 2002 05:25:28 -0000 2.59.6.2
--- frameobject.c 20 Apr 2002 05:07:05 -0000 2.59.6.3
***************
*** 417,422 ****
}
}
- if (f->f_nlocals == 0)
- return;
map = f->f_code->co_varnames;
if (!PyDict_Check(locals) || !PyTuple_Check(map))
--- 417,420 ----
***************
*** 427,431 ****
if (j > f->f_nlocals)
j = f->f_nlocals;
! map_to_dict(map, j, locals, fast, 0);
if (f->f_ncells || f->f_nfreevars) {
if (!(PyTuple_Check(f->f_code->co_cellvars)
--- 425,430 ----
if (j > f->f_nlocals)
j = f->f_nlocals;
! if (f->f_nlocals)
! map_to_dict(map, j, locals, fast, 0);
if (f->f_ncells || f->f_nfreevars) {
if (!(PyTuple_Check(f->f_code->co_cellvars)
***************
*** 456,460 ****
locals = f->f_locals;
map = f->f_code->co_varnames;
! if (locals == NULL || f->f_code->co_nlocals == 0)
return;
if (!PyDict_Check(locals) || !PyTuple_Check(map))
--- 455,459 ----
locals = f->f_locals;
map = f->f_code->co_varnames;
! if (locals == NULL)
return;
if (!PyDict_Check(locals) || !PyTuple_Check(map))
***************
*** 465,469 ****
if (j > f->f_nlocals)
j = f->f_nlocals;
! dict_to_map(f->f_code->co_varnames, j, locals, fast, 0, clear);
if (f->f_ncells || f->f_nfreevars) {
if (!(PyTuple_Check(f->f_code->co_cellvars)
--- 464,469 ----
if (j > f->f_nlocals)
j = f->f_nlocals;
! if (f->f_nlocals)
! dict_to_map(f->f_code->co_varnames, j, locals, fast, 0, clear);
if (f->f_ncells || f->f_nfreevars) {
if (!(PyTuple_Check(f->f_code->co_cellvars)