Merge with 3.2

4b0215fd · Kristján Valur Jónsson · 4164ac1f · c5d47d5a · 4b0215fd
Commit 4b0215fd authored Mar 23, 2012 by Kristján Valur Jónsson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Python/future.c Python/future.c +1 -1

No files found.
--- a/Python/future.c
+++ b/Python/future.c
@@ -86,7 +86,7 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename)
        */

        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) {