]> granicus.if.org Git - python/commitdiff
Issue #5765: Merge from 3.3
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 4 Nov 2012 13:53:15 +0000 (23:53 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sun, 4 Nov 2012 13:53:15 +0000 (23:53 +1000)
1  2 
Include/symtable.h
Misc/ACKS
Misc/NEWS
Python/symtable.c

Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
index ff440242cd88aa65eb4b3c90ec7ad3b77d9432a9,9dde9088322ab938688fd92a6607f83b6e8b5bc0..da2c1e30c36b5126db01c2b8986c8fc1b7a3adcd
@@@ -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;
      }
                                    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;
      }