summaryrefslogtreecommitdiff
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-01-06 10:49:32 +0100
committerVictor Stinner <victor.stinner@gmail.com>2017-01-06 10:49:32 +0100
commitcba7f2efa41887bb0fc8dad6ee444fa41ac12a7f (patch)
tree7b6e727c47ca5b1b7ad30ee49101dd623f474a57 /Python/pythonrun.c
parent3a2730f9bd5713020e5e3b1d60a71b048728af0a (diff)
parentbf0c87acc159ce002705d718c5e295affa4ede39 (diff)
downloadcpython-cba7f2efa41887bb0fc8dad6ee444fa41ac12a7f.tar.gz
Merge 3.6
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r--Python/pythonrun.c6
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)