diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:19:04 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:19:04 +0300 |
| commit | b53991455f7f258ede7a26b69c2be5b8138b9f8a (patch) | |
| tree | 3615cf0ef453ab113a547b1dfebacf415ed32602 /Python/pythonrun.c | |
| parent | 678487eb345f9f9dea3d3818ecad7d39145bdc65 (diff) | |
| parent | 9bfb9694a65124a8191cdb8ce7992445d1d0f4d2 (diff) | |
| download | cpython-b53991455f7f258ede7a26b69c2be5b8138b9f8a.tar.gz | |
Issue #29198: Merge 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) |