diff options
| author | ?ukasz Langa <lukasz@langa.pl> | 2017-02-10 00:20:16 -0800 |
|---|---|---|
| committer | ?ukasz Langa <lukasz@langa.pl> | 2017-02-10 00:20:16 -0800 |
| commit | 8972587fab93cd27ac78b4eab3805f5e11164cb9 (patch) | |
| tree | 3b6b18367a3054c41f3a186d60c321ef9a08ee38 /Python/pythonrun.c | |
| parent | c7a3f78cc193bfa7fc874f49ec2e0799b32da817 (diff) | |
| parent | 2328d19475109a50de26fa42832a5286824b0391 (diff) | |
| download | cpython-8972587fab93cd27ac78b4eab3805f5e11164cb9.tar.gz | |
Merge 3.6 (fix #29519)
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) |