summaryrefslogtreecommitdiff
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-12-02 21:33:05 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2016-12-02 21:33:05 +0200
commitedde41d53461acc888c73aedd16c4a218848526e (patch)
tree70176b7d373ae46a091ad316f43c20d1c223f40e /Python/pythonrun.c
parent720946323027f5bfb31c006cc9b3ce983af8291f (diff)
parentbfd49e943b6ca6172715524e1676b66208b59167 (diff)
downloadcpython-edde41d53461acc888c73aedd16c4a218848526e.tar.gz
Null merge
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 c881f901ab..b862e2b361 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)