diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-01-01 22:30:35 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2017-01-01 22:30:35 -0600 |
| commit | ffef0c198af2ab167ada78de149cff6d1ac027dc (patch) | |
| tree | a380595499b658f90ead38bc04a770a6d4d86920 /Python/pythonrun.c | |
| parent | a93fd4b5e57c60e66aa3699cdfe7efb2c0a77b4c (diff) | |
| parent | 9eadda5e87e8663d334833e17b9a06b43afb9395 (diff) | |
| download | cpython-ffef0c198af2ab167ada78de149cff6d1ac027dc.tar.gz | |
merge 3.6 (#29057)
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) |