diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-19 06:46:12 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-19 06:46:12 +0000 |
| commit | e8c24de3c793d24601a63dff7f3ae6657b23149f (patch) | |
| tree | 77a7179a9723fae19e33c1df310063c0d4c65663 /Python/pythonrun.c | |
| parent | 42ba543f18789c526c888607b74fee4309ccfcc3 (diff) | |
| parent | 090d171ce3824e06aba8710eb0b259ae4d8f75d7 (diff) | |
| download | cpython-e8c24de3c793d24601a63dff7f3ae6657b23149f.tar.gz | |
Issue #25677: Merge SyntaxError caret positioning from 3.6
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8befa546a9..5bddbad1c8 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -154,7 +154,7 @@ PyRun_InteractiveOneObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags) PyObject *m, *d, *v, *w, *oenc = NULL, *mod_name; mod_ty mod; PyArena *arena; - char *ps1 = "", *ps2 = "", *enc = NULL; + const char *ps1 = "", *ps2 = "", *enc = NULL; int errcode = 0; _Py_IDENTIFIER(encoding); _Py_IDENTIFIER(__main__); @@ -511,8 +511,8 @@ PyErr_Print(void) static void print_error_text(PyObject *f, int offset, PyObject *text_obj) { - char *text; - char *nl; + const char *text; + const char *nl; text = PyUnicode_AsUTF8(text_obj); if (text == NULL) |