Merge with 3.2

This commit is contained in:
Kristján Valur Jónsson 2012-03-23 12:52:11 +00:00
commit 4b0215fd99

View File

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