Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.2

This commit is contained in:
Benjamin Peterson 2012-03-22 10:40:20 -04:00
parent d0acb411ef 9faf5ee750
commit cc58031d6a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Python/future.c
View File

@ -86,7 +86,7 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename)
*/
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) {