diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
@@ -189,6 +189,7 @@ var,PyExc_ArithmeticError,3.2,
var,PyExc_AssertionError,3.2,
var,PyExc_AttributeError,3.2,
var,PyExc_BaseException,3.2,
var,PyExc_BlockingIOError,3.7,
var,PyExc_BrokenPipeError,3.7,
var,PyExc_BufferError,3.2,

@@ -205,6 +205,8 @@ struct _Py_exc_state {
    PyObject *errnomap;
    PyBaseExceptionObject *memerrors_freelist;
    int memerrors_numfree;
};



@@ -93,6 +93,7 @@ extern void _PyAsyncGen_Fini(PyInterpreterState *interp);
extern int _PySignal_Init(int install_signal_handlers);
extern void _PySignal_Fini(void);

extern void _PyExc_Fini(PyInterpreterState *interp);
extern void _PyImport_Fini(void);
extern void _PyImport_Fini2(void);

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -60,11 +60,14 @@ PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);

#define PyExceptionInstance_Class(x) ((PyObject*)Py_TYPE(x))


/* Predefined exceptions */

PyAPI_DATA(PyObject *) PyExc_BaseException;
PyAPI_DATA(PyObject *) PyExc_Exception;
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration;
#endif

diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt
@@ -2,7 +2,9 @@ BaseException
 ├── SystemExit
 ├── KeyboardInterrupt
 ├── GeneratorExit
 └── Exception
      ├── StopIteration
      ├── StopAsyncIteration
      ├── ArithmeticError

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -4032,7 +4032,11 @@ def test_builtin_bases(self):
        for tp in builtin_types:
            object.__getattribute__(tp, "__bases__")
            if tp is not object:
-                self.assertEqual(len(tp.__bases__), 1, tp)

        class L(list):
            pass

diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
@@ -668,7 +668,7 @@ def non_Python_modules(): r"""

    >>> import builtins
    >>> tests = doctest.DocTestFinder().find(builtins)
-    >>> 820 < len(tests) < 840 # approximate number of objects with docstrings
    True
    >>> real_tests = [t for t in tests if len(t.examples) > 0]
    >>> len(real_tests) # objects that actually have doctests
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,6 +205,8 @@ struct _Py_exc_state { @@
         PyObject *errnomap;
         PyBaseExceptionObject *memerrors_freelist;
         int memerrors_numfree;
     };
@@ Expand Down @@