diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-03-23 12:52:11 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-03-23 12:52:11 (GMT) |
| commit | 4b0215fd997cbdc714cb7515e121be96b9087cf4 (patch) | |
| tree | 2b3cb0fea348ea6c7ea258ec6ad26255dd7ccd97 /Python | |
| parent | 4164ac1f27c62b51140dcd93c992ef6dd395334e (diff) | |
| parent | c5d47d5ac3824f8b0788795897236ac02da0c954 (diff) | |
| download | cpython-4b0215fd997cbdc714cb7515e121be96b9087cf4.zip cpython-4b0215fd997cbdc714cb7515e121be96b9087cf4.tar.gz cpython-4b0215fd997cbdc714cb7515e121be96b9087cf4.tar.bz2 | |
Merge with 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 83465a8..d24ae41 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) { - identifier *modname = s->v.ImportFrom.module; + identifier modname = s->v.ImportFrom.module; if (modname && !PyUnicode_CompareWithASCIIString(modname, "__future__")) { if (done) { |