Backport Jeremy's checkin 1.7:

Fix 2.1 nested scopes crash reported by Evan Simpson

The new test case demonstrates the bug.  Be more careful in
symtable_resolve_free() to add a var to cells or frees only if it
won't be added under some other rule.

XXX Add new assertion that will catch this bug.

diff --git a/Lib/test/output/test_scope b/Lib/test/output/test_scope
index af7fe31e2b9c209eaa396929b1d3283233f73655..fcd4e7a9793f01f9ae3d343ee7f672922b210884 100644 (file)
--- a/Lib/test/output/test_scope
+++ b/Lib/test/output/test_scope
@@ -17,3 +17,4 @@ test_scope
 16. check leaks
 17. class and global
 18. verify that locals() works
+19. var is bound and free in class