summaryrefslogtreecommitdiffstats
path: root/Objects/exceptions.c
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2007-11-15 20:48:54 (GMT)
committerThomas Heller <theller@ctypes.org>2007-11-15 20:48:54 (GMT)
commit519a042c7c248e3ae23cf2a3c1152f91a5bd2791 (patch)
tree3eaef917fda4776da67d0426754f810e59d9f183 /Objects/exceptions.c
parent6e8ea0fd9c46978cf3101bd3ea94022751464ad9 (diff)
downloadcpython-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 'Objects/exceptions.c')
-rw-r--r--Objects/exceptions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 6ef765b..e26c350 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -89,9 +89,9 @@ BaseException_str(PyBaseExceptionObject *self)
case 0:
return PyUnicode_FromString("");
case 1:
- return PyObject_Unicode(PyTuple_GET_ITEM(self->args, 0));
+ return PyObject_Str(PyTuple_GET_ITEM(self->args, 0));
default:
- return PyObject_Unicode(self->args);
+ return PyObject_Str(self->args);
}
}
@@ -939,7 +939,7 @@ SyntaxError_str(PySyntaxErrorObject *self)
have_lineno = (self->lineno != NULL) && PyInt_CheckExact(self->lineno);
if (!filename && !have_lineno)
- return PyObject_Unicode(self->msg ? self->msg : Py_None);
+ return PyObject_Str(self->msg ? self->msg : Py_None);
if (filename && have_lineno)
return PyUnicode_FromFormat("%S (%s, line %ld)",