commit 519a042c7c248e3ae23cf2a3c1152f91a5bd2791
author Thomas Heller <theller@ctypes.org> Thu Nov 15 20:48:54 2007 +0000
committer Thomas Heller <theller@ctypes.org> Thu Nov 15 20:48:54 2007 +0000
tree 3eaef917fda4776da67d0426754f810e59d9f183
parent 6e8ea0fd9c46978cf3101bd3ea94022751464ad9

Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
#define for PyObject_Unicode in object.h.

Objects/exceptions.c

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 @@
     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 @@
     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)",