merge 3.2

b304764b · Benjamin Peterson · 98ba7534 · ab79c71f · b304764b
Kaydet (Commit) b304764b authored Mar 22, 2012 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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

        if (s->kind == ImportFrom_kind) {
            PyObject *modname = s->v.ImportFrom.module;
-            if (!PyUnicode_CompareWithASCIIString(modname, "__future__")) {
+            if (modname &&
+                !PyUnicode_CompareWithASCIIString(modname, "__future__")) {
                if (done) {
                    PyErr_SetString(PyExc_SyntaxError,
                                    ERR_LATE_FUTURE);