diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-04-20 17:42:50 +0200 |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-04-20 17:42:50 +0200 |
| commit | 67a2d7acf997a69c0592c1753be6a0986006c65f (patch) | |
| tree | 9c073bd7a8c4de860391cb77b5506a66ccdd5843 /Python/future.c | |
| parent | 2ee75d55cc5c1c419eae550c72c6b9497f47e48a (diff) | |
| parent | 93b04cdb7787723c3a26019d0de8834e86150108 (diff) | |
| download | cpython-67a2d7acf997a69c0592c1753be6a0986006c65f.tar.gz | |
MERGE: startswith and endswith don't accept None as slice index. Patch by Torsten Becker. (closes #11828)
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)) |