diff options
| author | Thomas Heller <theller@ctypes.org> | 2007-11-15 20:48:54 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2007-11-15 20:48:54 (GMT) |
| commit | 519a042c7c248e3ae23cf2a3c1152f91a5bd2791 (patch) | |
| tree | 3eaef917fda4776da67d0426754f810e59d9f183 /Python | |
| parent | 6e8ea0fd9c46978cf3101bd3ea94022751464ad9 (diff) | |
| download | cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.zip cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.tar.gz cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.tar.bz2 | |
Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
#define for PyObject_Unicode in object.h.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pythonrun.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8643951..0ba8646 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -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); } |