diff options
| author | Eli Bendersky <eliben@gmail.com> | 2011-04-16 15:34:29 +0300 |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2011-04-16 15:34:29 +0300 |
| commit | 9910660f9924d1034984117b14633268ebef83fa (patch) | |
| tree | 5487a4622adf07c5e85b29aace2279ae6f78ab95 /Python/future.c | |
| parent | b656205bc1a6e5243edc5d7f5eb37506e98fe118 (diff) | |
| parent | 45560b23ff86fd5c07a3c1e58a782a417531b7ea (diff) | |
| download | cpython-9910660f9924d1034984117b14633268ebef83fa.tar.gz | |
Issue #11855: merge from 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)) |