[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/daf9ea42b610
changeset:   84656:daf9ea42b610
parent:      84654:2650127ce034
parent:      84655:72312ff5f712
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jul 15 20:50:25 2013 -0700
summary:
  merge 3.3

files:
  Parser/tokenizer.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -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);

-- 
Repository URL: http://hg.python.org/cpython