From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 4 Nov 2012 13:53:15 +0000 (+1000)
Subject: Issue #5765: Merge from 3.3
X-Git-Tag: v3.4.0a1~2087
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e69bfc3fb6b8f241831d06b0dc9561ce9ac0ef8d;p=thirdparty%2FPython%2Fcpython.git

Issue #5765: Merge from 3.3
---

e69bfc3fb6b8f241831d06b0dc9561ce9ac0ef8d
diff --cc Python/symtable.c
index ff440242cd88,9dde9088322a..da2c1e30c36b
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@@ -1256,12 -1253,10 +1290,12 @@@ symtable_visit_stmt(struct symtable *st
                                    GLOBAL_AFTER_USE,
                                    c_name);
                  if (!symtable_warn(st, buf, s->lineno))
-                     return 0;
+                     VISIT_QUIT(st, 0);
              }
              if (!symtable_add_def(st, name, DEF_GLOBAL))
-                 return 0;
+                 VISIT_QUIT(st, 0);
 +            if (!symtable_record_directive(st, name, s))
-                 return 0;
++                VISIT_QUIT(st, 0);
          }
          break;
      }
@@@ -1287,12 -1282,10 +1321,12 @@@
                                    NONLOCAL_AFTER_USE,
                                    c_name);
                  if (!symtable_warn(st, buf, s->lineno))
-                     return 0;
+                     VISIT_QUIT(st, 0);
              }
              if (!symtable_add_def(st, name, DEF_NONLOCAL))
-                 return 0;
+                 VISIT_QUIT(st, 0);
 +            if (!symtable_record_directive(st, name, s))
-                 return 0;
++                VISIT_QUIT(st, 0);
          }
          break;
      }