[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

[kristjan.jonsson]

http://hg.python.org/cpython/rev/2a60096b3019
changeset:   75898:2a60096b3019
parent:      75896:669893133f9f
parent:      75897:b97964af7299
user:        Kristján Valur Jónsson <kristjan at ccpgames.com>
date:        Fri Mar 23 12:52:11 2012 +0000
summary:
  Merge with 3.2

files:
  Python/future.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/future.c b/Python/future.c
--- a/Python/future.c
+++ b/Python/future.c
@@ -86,7 +86,7 @@
         */
 
         if (s->kind == ImportFrom_kind) {
-            identifier *modname = s->v.ImportFrom.module;
+            identifier modname = s->v.ImportFrom.module;
             if (modname &&
                 !PyUnicode_CompareWithASCIIString(modname, "__future__")) {
                 if (done) {

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