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

benjamin.peterson python-checkins at python.org
Thu Mar 22 15:40:31 CET 2012


http://hg.python.org/cpython/rev/61aa76adca20
changeset: 75879:61aa76adca20
parent: 75876:5fe7d19ec49a
parent: 75877:79422b3684f1
user: Benjamin Peterson <benjamin at python.org>
date: Thu Mar 22 10:40:20 2012 -0400
summary:
 merge 3.2
files:
 Python/future.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Python/future.c b/Python/future.c
--- a/Python/future.c
+++ b/Python/future.c
@@ -86,7 +86,7 @@
 */
 
 if (s->kind == ImportFrom_kind) {
- PyObject *modname = s->v.ImportFrom.module;
+ identifier *modname = s->v.ImportFrom.module;
 if (modname &&
 !PyUnicode_CompareWithASCIIString(modname, "__future__")) {
 if (done) {
-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /