diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-06-12 02:11:18 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-06-12 02:11:18 (GMT) |
| commit | b9845e72f9af2c47fbeeb0d27bd1659e38a9ffbd (patch) | |
| tree | 4aa1710f2eafe066868bfe001317774344b0d1dd /Objects | |
| parent | 2585ad58e6b8bbb54888f31f72536f55a3c77b29 (diff) | |
| download | cpython-b9845e72f9af2c47fbeeb0d27bd1659e38a9ffbd.zip cpython-b9845e72f9af2c47fbeeb0d27bd1659e38a9ffbd.tar.gz cpython-b9845e72f9af2c47fbeeb0d27bd1659e38a9ffbd.tar.bz2 | |
Get rid of f_restricted too. Doc the other 4 ints that were already removed
at the NeedForSpeed sprint.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/frameobject.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 06c3c7a..a933c4a 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -20,7 +20,6 @@ static PyMemberDef frame_memberlist[] = { {"f_builtins", T_OBJECT, OFF(f_builtins),RO}, {"f_globals", T_OBJECT, OFF(f_globals), RO}, {"f_lasti", T_INT, OFF(f_lasti), RO}, - {"f_restricted",T_INT, OFF(f_restricted),RO}, {"f_exc_type", T_OBJECT, OFF(f_exc_type)}, {"f_exc_value", T_OBJECT, OFF(f_exc_value)}, {"f_exc_traceback", T_OBJECT, OFF(f_exc_traceback)}, @@ -341,11 +340,18 @@ frame_settrace(PyFrameObject *f, PyObject* v, void *closure) return 0; } +static PyObject * +frame_getrestricted(PyFrameObject *f, void *closure) +{ + return PyBool_FromLong(PyFrame_IsRestricted(f)); +} + static PyGetSetDef frame_getsetlist[] = { {"f_locals", (getter)frame_getlocals, NULL, NULL}, {"f_lineno", (getter)frame_getlineno, (setter)frame_setlineno, NULL}, {"f_trace", (getter)frame_gettrace, (setter)frame_settrace, NULL}, + {"f_restricted",(getter)frame_getrestricted,NULL, NULL}, {0} }; @@ -664,7 +670,6 @@ PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals, f->f_lasti = -1; f->f_lineno = code->co_firstlineno; - f->f_restricted = (builtins != tstate->interp->builtins); f->f_iblock = 0; f->f_stacktop = f->f_valuestack; |