changeset 84656:daf9ea42b610

merge 3.3
author Benjamin Peterson <benjamin@python.org>
date Mon, 15 Jul 2013 20:50:25 -0700
parents 2650127ce034 (current diff) 72312ff5f712 (diff)
children 7272ef213b7c
files Parser/tokenizer.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Parser/tokenizer.c	Mon Jul 15 20:47:47 2013 -0700
+++ b/Parser/tokenizer.c	Mon Jul 15 20:50:25 2013 -0700
@@ -254,9 +254,10 @@
 
             if (begin < t) {
                 char* r = new_string(begin, t - begin, tok);
+                char* q;
                 if (!r)
                     return 0;
-                char* q = get_normal_name(r);
+                q = get_normal_name(r);
                 if (r != q) {
                     PyMem_FREE(r);
                     r = new_string(q, strlen(q), tok);