summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-03-05 16:48:21 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-03-05 16:48:21 (GMT)
commit1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54 (patch)
tree9385c17c0bceed0627296ec2fa9e07c2e0afbdc1 /Objects
parent1649c1b33a1d8f46ccf97b8373f62a22bbb3fde6 (diff)
parentc53d6242359cd0dcf736a6c455a6397074815d46 (diff)
downloadcpython-1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54.zip
cpython-1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54.tar.gz
cpython-1e88f3faa61dbaa9ea0d2404aa8563c1eeceba54.tar.bz2
Merge.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/frameobject.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 9b05b9d..c1ec811 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -20,7 +20,6 @@ static PyMemberDef frame_memberlist[] = {
{"f_builtins", T_OBJECT, OFF(f_builtins), READONLY},
{"f_globals", T_OBJECT, OFF(f_globals), READONLY},
{"f_lasti", T_INT, OFF(f_lasti), READONLY},
- {"f_yieldfrom", T_OBJECT, OFF(f_yieldfrom), READONLY},
{NULL} /* Sentinel */
};