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

[benjamin.peterson]

http://hg.python.org/cpython/rev/db154e62ac03
changeset:   75871:db154e62ac03
parent:      75869:9d793be3b4eb
parent:      75870:1b467efb9b27
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Mar 22 08:56:27 2012 -0400
summary:
  merge 3.2

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


diff --git a/Python/future.c b/Python/future.c
--- a/Python/future.c
+++ b/Python/future.c
@@ -87,7 +87,8 @@
 
         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);

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