diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-04-24 02:42:52 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-04-24 02:42:52 +0200 |
| commit | 995f9c25cb84dca8b32ded12294248f124f104ba (patch) | |
| tree | ba69ecfe2b25d9d1728bb29a1202ae9d47e582a0 /Python/future.c | |
| parent | 63f518b88a2be3126d4068caf80ab85a50d5cabc (diff) | |
| parent | dcb455140c3b558922c27b9bd935032cf0b35fc7 (diff) | |
| download | cpython-995f9c25cb84dca8b32ded12294248f124f104ba.tar.gz | |
Merge 3.1
Diffstat (limited to 'Python/future.c')
| -rw-r--r-- | Python/future.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Python/future.c b/Python/future.c index 515dcd9dc6..d6b653f315 100644 --- a/Python/future.c +++ b/Python/future.c @@ -4,7 +4,6 @@ #include "token.h" #include "graminit.h" #include "code.h" -#include "compile.h" #include "symtable.h" #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" @@ -44,12 +43,12 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename) } else if (strcmp(feature, "braces") == 0) { PyErr_SetString(PyExc_SyntaxError, "not a chance"); - PyErr_SyntaxLocation(filename, s->lineno); + PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset); return 0; } else { PyErr_Format(PyExc_SyntaxError, UNDEFINED_FUTURE_FEATURE, feature); - PyErr_SyntaxLocation(filename, s->lineno); + PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset); return 0; } } @@ -98,8 +97,7 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename) if (done) { PyErr_SetString(PyExc_SyntaxError, ERR_LATE_FUTURE); - PyErr_SyntaxLocation(filename, - s->lineno); + PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset); return 0; } if (!future_check_features(ff, s, filename)) |