summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-03-05 15:25:40 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-03-05 15:25:40 (GMT)
commitd1671239a485556d02f5b62c5dc868107e71360b (patch)
tree0baf53f808c9e1b14b384956d0a533d4e6d5b3d1
parent6a59b70cbac0a35f8b520d196105974949153181 (diff)
parent400a968dfc18a49139c68a6e7d650d5c8ca683f1 (diff)
downloadcpython-d1671239a485556d02f5b62c5dc868107e71360b.zip
cpython-d1671239a485556d02f5b62c5dc868107e71360b.tar.gz
cpython-d1671239a485556d02f5b62c5dc868107e71360b.tar.bz2
Branch merge
-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 */
};