Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
#define for PyObject_Unicode in object.h.
diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index 6c3c1e6..b771149 100644
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -770,7 +770,7 @@
case 'r':
return PyObject_Repr(obj);
case 's':
- return PyObject_Unicode(obj);
+ return PyObject_Str(obj);
default:
PyErr_Format(PyExc_ValueError,
"Unknown converion specifier %c",
diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h
index fa6140f..64777be 100644
--- a/Objects/stringlib/unicodedefs.h
+++ b/Objects/stringlib/unicodedefs.h
@@ -20,7 +20,7 @@
#define STRINGLIB_NEW PyUnicode_FromUnicode
#define STRINGLIB_RESIZE PyUnicode_Resize
#define STRINGLIB_CHECK PyUnicode_Check
-#define STRINGLIB_TOSTR PyObject_Unicode
+#define STRINGLIB_TOSTR PyObject_Str
#define STRINGLIB_WANT_CONTAINS_OBJ 1