Rename 'unicode' to 'str' in its tp_name field. Rename 'str' to 'str8'.
Change all occurrences of unichr to chr.
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 2132b8d..4ae8f60 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1122,7 +1122,7 @@
         # this used to leak references
         try:
             class C(object):
-                __slots__ = [unichr(128)]
+                __slots__ = [chr(128)]
         except (TypeError, UnicodeEncodeError):
             pass
         else: