Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
#define for PyObject_Unicode in object.h.
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 701b112..3e4e22d 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -552,7 +552,7 @@
if (PyUnicode_Check(arg))
ucvt = NULL;
else {
- arg = ucvt = PyObject_Unicode(arg);
+ arg = ucvt = PyObject_Str(arg);
if (arg == NULL)
return NULL;
else if (!PyUnicode_Check(arg)) {
@@ -728,7 +728,7 @@
if (PyUnicode_Check(unistr))
ucvt = NULL;
else {
- unistr = ucvt = PyObject_Unicode(unistr);
+ unistr = ucvt = PyObject_Str(unistr);
if (unistr == NULL)
return NULL;
else if (!PyUnicode_Check(unistr)) {