Rename 'unicode' to 'str' in its tp_name field. Rename 'str' to 'str8'.
Change all occurrences of unichr to chr.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index ee29c70..68bf703 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4009,7 +4009,7 @@
PyTypeObject PyString_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0,
- "str",
+ "str8",
sizeof(PyStringObject),
sizeof(char),
string_dealloc, /* tp_dealloc */
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e2f1b2f..d4a7e7e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7954,7 +7954,7 @@
PyTypeObject PyUnicode_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
- "unicode", /* tp_name */
+ "str", /* tp_name */
sizeof(PyUnicodeObject), /* tp_size */
0, /* tp_itemsize */
/* Slots */