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.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

@@ -1989,6 +1989,13 @@ def test_builtin_types(self):
  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):

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

@@ -1040,7 +1040,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(),

Lib/test/test_generators.py

@@ -977,10 +977,10 @@ def b():
 ... yield 1
 ...
 >>> type(g)
-<class 'function'>
+<class 'types.FunctionType'>
 >>> i = g()
 >>> type(i)
-<class 'generator'>
+<class 'types.GeneratorType'>
 >>> [s for s in dir(i) if not s.startswith('_')]
 ['close', 'gi_code', 'gi_frame', 'gi_running', 'gi_suspended', 'gi_yieldfrom', 'send', 'throw']
 >>> from test.support import HAVE_DOCSTRINGS
@@ -997,11 +997,11 @@ def b():
 >>> i.gi_running
 0
 >>> type(i.gi_frame)
-<class 'frame'>
+<class 'types.FrameType'>
 >>> i.gi_running = 42
 Traceback (most recent call last):
  ...
-AttributeError: attribute 'gi_running' of 'generator' objects is not writable
+AttributeError: attribute 'gi_running' of 'types.GeneratorType' objects is not writable
 >>> def g():
 ... yield me.gi_running
 >>> me = g()
@@ -1372,27 +1372,27 @@ def b():
 >>> def f():
 ... yield
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 
 >>> def f():
 ... if 0:
 ... yield
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 
 >>> def f():
 ... if 0:
 ... yield 1
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f():
 ... if "":
 ... yield None
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f():
 ... return
@@ -1416,15 +1416,15 @@ def b():
 ... x = 1
 ... return
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f():
 ... if 0:
 ... def g():
 ... yield 1
 ...
 >>> type(f())
-<class 'NoneType'>
+<class 'types.NoneType'>
 
 >>> def f():
 ... if 0:
@@ -1434,15 +1434,15 @@ def b():
 ... def f(self):
 ... yield 2
 >>> type(f())
-<class 'NoneType'>
+<class 'types.NoneType'>
 
 >>> def f():
 ... if 0:
 ... return
 ... if 0:
 ... yield 2
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 This one caused a crash (see SF bug 567538):
 
@@ -2093,7 +2093,7 @@ def printsolution(self, x):
 
 >>> def f(): list(i for i in [(yield 26)])
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 
 A yield expression with augmented assignment.
@@ -2364,21 +2364,21 @@ def printsolution(self, x):
 
 >>> def f(): x += yield
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f(): x = yield
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f(): lambda x=(yield): 1
 >>> type(f())
-<class 'generator'>
+<class 'types.GeneratorType'>
 
 >>> def f(d): d[(yield "a")] = d[(yield "b")] = 27
 >>> data = [1,2]
 >>> g = f(data)
 >>> type(g)
-<class 'generator'>
+<class 'types.GeneratorType'>
 >>> g.send(None)
 'a'
 >>> data

Lib/test/test_genexps.py

@@ -48,7 +48,7 @@
 
  >>> g = (i*i for i in range(4))
  >>> type(g)
- <class 'generator'>
+ <class 'types.GeneratorType'>
  >>> list(g)
  [0, 1, 4, 9]
 

Lib/test/test_grammar.py

@@ -1521,9 +1521,9 @@ def check(test):
  msg=r'indices must be integers or slices, not dict;'
  check('[[1, 2] [{3: 4}]]')
  check('[[1, 2] [{i: i for i in range(5)}]]')
- msg=r'indices must be integers or slices, not generator;'
+ msg=r'indices must be integers or slices, not types\.GeneratorType;'
  check('[[1, 2] [(i for i in range(5))]]')
- msg=r'indices must be integers or slices, not function;'
+ msg=r'indices must be integers or slices, not types\.FunctionType;'
  check('[[1, 2] [(lambda x, y: x)]]')
  msg=r'indices must be integers or slices, not str;'
  check('[[1, 2] [f"{x}"]]')

Lib/test/test_json/test_fail.py

@@ -100,7 +100,7 @@ def test_non_string_keys_dict(self):
  def test_not_serializable(self):
  import sys
  with self.assertRaisesRegex(TypeError,
- 'Object of type module is not JSON serializable'):
+ 'Object of type ModuleType is not JSON serializable'):
  self.dumps(sys)
 
  def test_truncated_input(self):