Merge with 3.2

Kristján Valur Jónsson · Kristján Valur Jónsson · commit 4b0215fd997c · 2012-03-23T12:52:11.000Z
diff --git 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) {
