commit 9fa47ebafedaf1aef4480bc115b182a62efb79e1
author Benjamin Peterson <benjamin@python.org> Thu Apr 26 00:27:06 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Thu Apr 26 00:27:06 2012 -0400
tree 0d97445bce1727b9003c43c1dfa8cfbb3787ce5f
parent 1138944888d13d2600241ca0d9408e018077d691
parent e0d88a173c5ccc346b8d7c6e805f0e49b4ea92f7

merge heads

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index a4e5a32..b9a006b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2132,6 +2132,7 @@
                                              GLOBAL_NAME_ERROR_MSG, w);
                     break;
                 }
+                Py_INCREF(x);
             }
             else {
                 /* Slow-path if globals or builtins is not a dict */
@@ -2147,7 +2148,6 @@
                     }
                 }
             }
-            Py_INCREF(x);
             PUSH(x);
             DISPATCH();