Merge branch 'main' into b/asyncio-old-repl-multiline

Author: johnslavik

Lib/test/test_pydoc/test_pydoc.py

@@ -1413,7 +1413,7 @@ def test_special_form(self):
             self.assertIn('NoReturn = typing.NoReturn', doc)
             self.assertIn(typing.NoReturn.__doc__.strip().splitlines()[0], doc)
         else:
-            self.assertIn('NoReturn = class _SpecialForm(_Final)', doc)
+            self.assertIn('NoReturn = class _SpecialForm(_Final, _NotIterable)', doc)
 
     def test_typing_pydoc(self):
         def foo(data: typing.List[typing.Any],