diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-03-22 14:40:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-03-22 14:40:20 (GMT) |
| commit | cc58031d6a800647b0e37c8fa812bbe1200eac22 (patch) | |
| tree | 0d987974f4725aa27ce97a4add3e04ccc38cfc8b /Python | |
| parent | d0acb411ef6790b5ecfbd8b6be9c2d0cc1aeb4d5 (diff) | |
| parent | 9faf5ee7509276eb3aef4463ba778632ef4a5fd4 (diff) | |
| download | cpython-cc58031d6a800647b0e37c8fa812bbe1200eac22.zip cpython-cc58031d6a800647b0e37c8fa812bbe1200eac22.tar.gz cpython-cc58031d6a800647b0e37c8fa812bbe1200eac22.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/future.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/future.c b/Python/future.c index 89592e2..83465a8 100644 --- a/Python/future.c +++ b/Python/future.c @@ -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) { |