Fix doctests.

Author: serhiy-storchaka

Doc/howto/argparse.rst

@@ -555,7 +555,7 @@ And this is what it gives:
    Traceback (most recent call last):
      File "prog.py", line 11, in <module>
        if args.verbosity >= 2:
-   TypeError: '>=' not supported between instances of 'NoneType' and 'int'
+   TypeError: '>=' not supported between instances of 'types.NoneType' and 'int'
 
 
 * First output went well, and fixes the bug we had before.

Doc/howto/descriptor.rst

@@ -1379,7 +1379,7 @@ and :attr:`~function.__doc__`.
     'StaticMethod'
     >>> f = E_sim.f
     >>> type(f).__name__
-    'function'
+    'FunctionType'
     >>> sm.__name__
     'f'
     >>> f.__name__
@@ -1523,7 +1523,7 @@ Using the non-data descriptor protocol, a pure Python version of
     # Verify that __wrapped__ was added and works correctly
     >>> f = vars(T)['cm'].__wrapped__
     >>> type(f).__name__
-    'function'
+    'FunctionType'
     >>> f.__name__
     'cm'
     >>> f(T, 11, 22)

Doc/library/doctest.rst

@@ -554,7 +554,7 @@ Some details you should read once, but won't need to remember:
        File "<stdin>", line 1
          1 + None
          ~~^~~~~~
-     TypeError: unsupported operand type(s) for +: 'int' and 'NoneType'
+     TypeError: unsupported operand type(s) for +: 'int' and 'types.NoneType'
 
   Since the lines showing the position of the error come before the exception type
   and detail, they are not checked by doctest.  For example, the following test
@@ -564,7 +564,7 @@ Some details you should read once, but won't need to remember:
        File "<stdin>", line 1
          1 + None
          ^~~~~~~~
-     TypeError: unsupported operand type(s) for +: 'int' and 'NoneType'
+     TypeError: unsupported operand type(s) for +: 'int' and 'types.NoneType'
 
 
 .. _option-flags-and-directives:

Doc/library/re.rst

@@ -1681,7 +1681,7 @@ To find out what card the pair consists of, one could use the
    Traceback (most recent call last):
      File "<pyshell#23>", line 1, in <module>
        pair_re.prefixmatch("718ak").group(1)
-   AttributeError: 'NoneType' object has no attribute 'group'
+   AttributeError: 'types.NoneType' object has no attribute 'group'
 
    >>> pair_re.prefixmatch("354aa").group(1)
    'a'

Doc/library/typing.rst

@@ -1484,9 +1484,9 @@ These can be used as types in annotations. They all support subscription using
         >>> def func(x: Annotated[int, "metadata"]) -> None: pass
         ...
         >>> get_type_hints(func)
-        {'x': <class 'int'>, 'return': <class 'NoneType'>}
+        {'x': <class 'int'>, 'return': <class 'types.NoneType'>}
         >>> get_type_hints(func, include_extras=True)
-        {'x': typing.Annotated[int, 'metadata'], 'return': <class 'NoneType'>}
+        {'x': typing.Annotated[int, 'metadata'], 'return': <class 'types.NoneType'>}
 
    At runtime, the metadata associated with an ``Annotated`` type can be
    retrieved via the :attr:`!__metadata__` attribute: