From ddc3fb573429a40ac7c80088edf25ee19f7a5265 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 25 Nov 1997 20:58:13 +0000 Subject: [PATCH] Apply str() to sys.ps1 or sys.ps2 before using them as a prompt, so you can assign an object whose str() evaluates to the current directory (or whatever). --- Python/pythonrun.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index bfed548674e..b8abe252ea1 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -459,24 +459,22 @@ PyRun_InteractiveOne(fp, filename) PyObject *m, *d, *v, *w; node *n; perrdetail err; - char *ps1, *ps2; + char *ps1 = "", *ps2 = ""; v = PySys_GetObject("ps1"); + if (v != NULL) { + v = PyObject_Str(v); + if (v == NULL) + PyErr_Clear(); + else if (PyString_Check(v)) + ps1 = PyString_AsString(v); + } w = PySys_GetObject("ps2"); - if (v != NULL && PyString_Check(v)) { - Py_INCREF(v); - ps1 = PyString_AsString(v); - } - else { - v = NULL; - ps1 = ""; - } - if (w != NULL && PyString_Check(w)) { - Py_INCREF(w); - ps2 = PyString_AsString(w); - } - else { - w = NULL; - ps2 = ""; + if (w != NULL) { + w = PyObject_Str(w); + if (w == NULL) + PyErr_Clear(); + else if (PyString_Check(w)) + ps2 = PyString_AsString(w); } Py_BEGIN_ALLOW_THREADS n = PyParser_ParseFile(fp, filename, &_PyParser_Grammar,