gh-100129: Make the names of all classes in the types module resolvable

Doc/library/functools.rst

@@ -548,7 +548,7 @@ The :mod:`functools` module defines the following functions:
    attribute::
 
     >>> fun.registry.keys()
-    dict_keys([<class 'NoneType'>, <class 'int'>, <class 'object'>,
+    dict_keys([<class 'types.NoneType'>, <class 'int'>, <class 'object'>,
               <class 'decimal.Decimal'>, <class 'list'>,
               <class 'float'>])
     >>> fun.registry[float]

Doc/library/multiprocessing.rst

@@ -460,9 +460,9 @@ process which created it.
       Traceback (most recent call last):
       Traceback (most recent call last):
       Traceback (most recent call last):
-      AttributeError: 'module' object has no attribute 'f'
-      AttributeError: 'module' object has no attribute 'f'
-      AttributeError: 'module' object has no attribute 'f'
+      AttributeError: 'types.ModuleType' object has no attribute 'f'
+      AttributeError: 'types.ModuleType' object has no attribute 'f'
+      AttributeError: 'types.ModuleType' object has no attribute 'f'
 
    (If you try this it will actually output three full tracebacks
    interleaved in a semi-random fashion, and then you may have to

Doc/library/multiprocessing.shared_memory.rst

@@ -300,7 +300,7 @@ instance:
    >>> from multiprocessing import shared_memory
    >>> a = shared_memory.ShareableList(['howdy', b'HoWdY', -273.154, 100, None, True, 42])
    >>> [ type(entry) for entry in a ]
-   [<class 'str'>, <class 'bytes'>, <class 'float'>, <class 'int'>, <class 'NoneType'>, <class 'bool'>, <class 'int'>]
+   [<class 'str'>, <class 'bytes'>, <class 'float'>, <class 'int'>, <class 'types.NoneType'>, <class 'bool'>, <class 'int'>]
    >>> a[2]
    -273.154
    >>> a[2] = -78.5

Doc/library/unittest.mock.rst

@@ -890,7 +890,7 @@ object::
     ...
     >>> mock = MagicMock(async_func)
     >>> mock
-    <MagicMock spec='function' id='...'>
+    <MagicMock spec='FunctionType' id='...'>
     >>> mock()  # doctest: +SKIP
     <coroutine object AsyncMockMixin._mock_call at ...>
 

Lib/test/pickletester.py

@@ -1,3 +1,4 @@
+import builtins
 import collections
 import copyreg
 import dbm
@@ -11,6 +12,7 @@
 import struct
 import sys
 import threading
+import types
 import unittest
 import weakref
 from textwrap import dedent
@@ -1980,6 +1982,40 @@ def test_singleton_types(self):
                 u = self.loads(s)
                 self.assertIs(type(singleton), u)
 
+    def test_builtin_types(self):
+        for t in builtins.__dict__.values():
+            if isinstance(t, type) and not issubclass(t, BaseException):
+                for proto in protocols:
+                    s = self.dumps(t, proto)
+                    self.assertIs(self.loads(s), t)
+
+    def test_types_types(self):
+        for t in types.__dict__.values():
+            if isinstance(t, type):
+                for proto in protocols:
+                    s = self.dumps(t, proto)
+                    self.assertIs(self.loads(s), t)
+
+    def test_builtin_exceptions(self):
+        for t in builtins.__dict__.values():
+            if isinstance(t, type) and issubclass(t, BaseException):
+                for proto in protocols:
+                    s = self.dumps(t, proto)
+                    u = self.loads(s)
+                    if proto <= 2 and issubclass(t, OSError) and t is not BlockingIOError:
+                        self.assertIs(u, OSError)
+                    elif proto <= 2 and issubclass(t, ImportError):
+                        self.assertIs(u, ImportError)
+                    else:
+                        self.assertIs(u, t)
+
+    def test_builtin_functions(self):
+        for t in builtins.__dict__.values():
+            if isinstance(t, types.BuiltinFunctionType):
+                for proto in protocols:
+                    s = self.dumps(t, proto)
+                    self.assertIs(self.loads(s), t)
+
     # Tests for protocol 2
 
     def test_proto(self):

Lib/test/test_complex.py

@@ -395,7 +395,7 @@ def split_zeros(x):
         self.assertRaises(TypeError, float, 5+3j)
         self.assertRaises(ValueError, complex, "")
         self.assertRaises(TypeError, complex, None)
-        self.assertRaisesRegex(TypeError, "not 'NoneType'", complex, None)
+        self.assertRaisesRegex(TypeError, "not 'types.NoneType'", complex, None)
         self.assertRaises(ValueError, complex, "\0")
         self.assertRaises(ValueError, complex, "3\09")
         self.assertRaises(TypeError, complex, "1", "2")

Lib/test/test_coroutines.py

@@ -565,7 +565,7 @@ async def foo():
         coro = foo()
 
         check = lambda: self.assertRaisesRegex(
-            TypeError, "'coroutine' object is not iterable")
+            TypeError, r"'types\.CoroutineType' object is not iterable")
 
         with check():
             list(coro)
@@ -597,7 +597,7 @@ async def foo():
             await bar()
 
         check = lambda: self.assertRaisesRegex(
-            TypeError, "'coroutine' object is not iterable")
+            TypeError, r"'types\.CoroutineType' object is not iterable")
 
         coro = foo()
         with check():
@@ -958,7 +958,7 @@ def test_corotype_1(self):
         self.assertIn('in coroutine', ct.throw.__doc__)
         self.assertIn('of the coroutine', ct.__dict__['__name__'].__doc__)
         self.assertIn('of the coroutine', ct.__dict__['__qualname__'].__doc__)
-        self.assertEqual(ct.__name__, 'coroutine')
+        self.assertEqual(ct.__name__, 'CoroutineType')
 
         async def f(): pass
         c = f()

Lib/test/test_csv.py

@@ -1032,7 +1032,7 @@ class mydialect(csv.Dialect):
         with self.assertRaises(csv.Error) as cm:
             mydialect()
         self.assertEqual(str(cm.exception),
-                         '"delimiter" must be string, not NoneType')
+                         '"delimiter" must be string, not types.NoneType')
 
     def test_escapechar(self):
         class mydialect(csv.Dialect):

Lib/test/test_descr.py

@@ -4832,11 +4832,11 @@ class X:
 
     def test_qualname(self):
         descriptors = [str.lower, complex.real, float.real, int.__add__]
-        types = ['method', 'member', 'getset', 'wrapper']
+        types = ['Method', 'Member', 'GetSet', 'Wrapper']
 
         # make sure we have an example of each type of descriptor
         for d, n in zip(descriptors, types):
-            self.assertEqual(type(d).__name__, n + '_descriptor')
+            self.assertEqual(type(d).__name__, n + 'DescriptorType')
 
         for d in descriptors:
             qualname = d.__objclass__.__qualname__ + '.' + d.__name__

Lib/test/test_extcall.py

@@ -263,73 +263,71 @@
       ...
     TypeError: h() got an unexpected keyword argument 'e'
 
-    >>> h(*h)
+    >>> h(*1)
     Traceback (most recent call last):
       ...
-    TypeError: test.test_extcall.h() argument after * must be an iterable, not function
+    TypeError: test.test_extcall.h() argument after * must be an iterable, not int
 
-    >>> h(1, *h)
+    >>> h(1, *2)
     Traceback (most recent call last):
       ...
-    TypeError: Value after * must be an iterable, not function
+    TypeError: Value after * must be an iterable, not int
 
-    >>> h(*[1], *h)
+    >>> h(*[1], *2)
     Traceback (most recent call last):
       ...
-    TypeError: Value after * must be an iterable, not function
+    TypeError: Value after * must be an iterable, not int
 
-    >>> dir(*h)
+    >>> dir(*1)
     Traceback (most recent call last):
       ...
-    TypeError: dir() argument after * must be an iterable, not function
+    TypeError: dir() argument after * must be an iterable, not int
 
     >>> nothing = None
-    >>> nothing(*h)
+    >>> nothing(*1)
     Traceback (most recent call last):
       ...
-    TypeError: None argument after * must be an iterable, \
-not function
+    TypeError: None argument after * must be an iterable, not int
 
-    >>> h(**h)
+    >>> h(**1)
     Traceback (most recent call last):
       ...
-    TypeError: test.test_extcall.h() argument after ** must be a mapping, not function
+    TypeError: test.test_extcall.h() argument after ** must be a mapping, not int
 
     >>> h(**[])
     Traceback (most recent call last):
       ...
     TypeError: test.test_extcall.h() argument after ** must be a mapping, not list
 
-    >>> h(a=1, **h)
+    >>> h(a=1, **2)
     Traceback (most recent call last):
       ...
-    TypeError: test.test_extcall.h() argument after ** must be a mapping, not function
+    TypeError: test.test_extcall.h() argument after ** must be a mapping, not int
 
     >>> h(a=1, **[])
     Traceback (most recent call last):
       ...
     TypeError: test.test_extcall.h() argument after ** must be a mapping, not list
 
-    >>> h(**{'a': 1}, **h)
+    >>> h(**{'a': 1}, **2)
     Traceback (most recent call last):
       ...
-    TypeError: test.test_extcall.h() argument after ** must be a mapping, not function
+    TypeError: test.test_extcall.h() argument after ** must be a mapping, not int
 
     >>> h(**{'a': 1}, **[])
     Traceback (most recent call last):
       ...
     TypeError: test.test_extcall.h() argument after ** must be a mapping, not list
 
-    >>> dir(**h)
+    >>> dir(**1)
     Traceback (most recent call last):
       ...
-    TypeError: dir() argument after ** must be a mapping, not function
+    TypeError: dir() argument after ** must be a mapping, not int
 
-    >>> nothing(**h)
+    >>> nothing(**1)
     Traceback (most recent call last):
       ...
-    TypeError: None argument after ** must be a mapping, \
-not function
+    TypeError: None argument after ** must be a mapping, not int
 
     >>> dir(b=1, **{'b': 1})
     Traceback (most recent call last):

Lib/test/test_funcattrs.py

@@ -112,7 +112,7 @@ def f(): print(a)
         self.assertIsInstance(c, tuple)
         self.assertEqual(len(c), 1)
         # don't have a type object handy
-        self.assertEqual(c[0].__class__.__name__, "cell")
+        self.assertEqual(c[0].__class__.__name__, "CellType")
         self.cannot_set_attr(f, "__closure__", c, AttributeError)
 
     def test_cell_new(self):

Lib/test/test_gdb.py

@@ -756,7 +756,7 @@ def test_pyup_command(self):
         self.assertMultilineMatches(bt,
                                     r'''^.*
 #[0-9]+ Frame 0x-?[0-9a-f]+, for file <string>, line 12, in baz \(args=\(1, 2, 3\)\)
-#[0-9]+ <built-in method pyobject_fastcall of module object at remote 0x[0-9a-f]+>
+#[0-9]+ <built-in method pyobject_fastcall of types.ModuleType object at remote 0x[0-9a-f]+>
 $''')
 
     @unittest.skipUnless(HAS_PYUP_PYDOWN, "test requires py-up/py-down commands")
@@ -785,7 +785,7 @@ def test_up_then_down(self):
         self.assertMultilineMatches(bt,
                                     r'''^.*
 #[0-9]+ Frame 0x-?[0-9a-f]+, for file <string>, line 12, in baz \(args=\(1, 2, 3\)\)
-#[0-9]+ <built-in method pyobject_fastcall of module object at remote 0x[0-9a-f]+>
+#[0-9]+ <built-in method pyobject_fastcall of types.ModuleType object at remote 0x[0-9a-f]+>
 #[0-9]+ Frame 0x-?[0-9a-f]+, for file <string>, line 12, in baz \(args=\(1, 2, 3\)\)
 $''')
 
@@ -799,7 +799,7 @@ def test_bt(self):
         self.assertMultilineMatches(bt,
                                     r'''^.*
 Traceback \(most recent call first\):
-  <built-in method id of module object .*>
+  <built-in method id of types\.ModuleType object .*>
   File ".*gdb_sample.py", line 10, in baz
     id\(42\)
   File ".*gdb_sample.py", line 7, in bar
@@ -1014,7 +1014,7 @@ def test_printing_builtin(self):
         bt = self.get_stack_trace(script=self.get_sample_script(),
                                   cmds_after_breakpoint=['py-up', 'py-print len'])
         self.assertMultilineMatches(bt,
-                                    r".*\nbuiltin 'len' = <built-in method len of module object at remote 0x-?[0-9a-f]+>\n.*")
+                                    r".*\nbuiltin 'len' = <built-in method len of types\.ModuleType object at remote 0x-?[0-9a-f]+>\n.*")
 
 class PyLocalsTests(DebuggerTests):
     @unittest.skipIf(python_is_optimized(),