diff options
| author | Ned Deily <nad@acm.org> | 2011-05-29 02:42:28 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-05-29 02:42:28 -0700 |
| commit | 575a5fe3c95817f60b8d00870069c4e908b927ff (patch) | |
| tree | a7ee7bc321ed38c52ce6ad25b1dd4a7632b42c74 /Python/future.c | |
| parent | ccddb809862bd4c6bf7de6658dee1554e0992cdc (diff) | |
| parent | edbe774ba3009fa2f051cbf4c5d63d9de22dd299 (diff) | |
| download | cpython-575a5fe3c95817f60b8d00870069c4e908b927ff.tar.gz | |
Record null merge of Issue #12205
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)) |