[Python-checkins] cpython (merge default -> default): Branch merge

Mon Mar 5 16:26:21 CET 2012

http://hg.python.org/cpython/rev/e12a65da2358
changeset: 75430:e12a65da2358
parent: 75429:561532103d74
parent: 75421:84620bca0e35
user: Éric Araujo <merwok at netwok.org>
date: Mon Mar 05 16:25:40 2012 +0100
summary:
 Branch merge
files:
 Objects/frameobject.c | 1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -20,7 +20,6 @@
 {"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 */
 };
 
-- 
Repository URL: http://hg.python.org/cpython
