mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-10 04:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Replace PyObject_Unicode with PyObject_Str everywhere, and remove the

Browse source 
#define for PyObject_Unicode in object.h.
This commit is contained in:
Thomas Heller 2007-11-15 20:48:54 +00:00
parent 6e8ea0fd9c
commit 519a042c7c
13 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/pythonrun.c
View file

@ -911,7 +911,7 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
}
v = PySys_GetObject("ps1");
if (v != NULL) {
v = PyObject_Unicode(v);
v = PyObject_Str(v);
if (v == NULL)
PyErr_Clear();
else if (PyUnicode_Check(v))
@ -919,7 +919,7 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
}
w = PySys_GetObject("ps2");
if (w != NULL) {
w = PyObject_Unicode(w);
w = PyObject_Str(w);
if (w == NULL)
PyErr_Clear();
else if (PyUnicode_Check(w))
@ -1373,7 +1373,7 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
else
err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
if (err == 0 && (value != Py_None)) {
PyObject *s = PyObject_Unicode(value);
PyObject *s = PyObject_Str(value);
/* only print colon if the str() of the
object is not the empty string
*/
@ -1687,7 +1687,7 @@ err_input(perrdetail *err)
PyObject *type, *value, *tb;
PyErr_Fetch(&type, &value, &tb);
if (value != NULL) {
u = PyObject_Unicode(value);
u = PyObject_Str(value);
if (u != NULL) {
msg = PyUnicode_AsString(u);
}