Now that standard exceptions are builtin, we don't need two phase init

or fini of the builtin module.

_PyBuiltin_Init_1 => _PyBuiltin_Init
_PyBuiltin_Init_2 removed
_PyBuiltin_Fini_1 removed
_PyBuiltin_Fini_2 removed

These functions are used to initialize the _exceptions module.

init_exceptions added
fini_exceptions added

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 2c1df070ef64d0c6138c9774fd778782d19dc485..2648d1c0966a2e5c402c89ae48e737ac6f8ef9f7 100644 (file)
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -87,16 +87,13 @@ DL_IMPORT(const char *) Py_GetCompiler Py_PROTO((void));
 DL_IMPORT(const char *) Py_GetBuildInfo Py_PROTO((void));
 
 /* Internal -- various one-time initializations */
-
-DL_IMPORT(PyObject *) _PyBuiltin_Init_1 Py_PROTO((void));
-DL_IMPORT(void) _PyBuiltin_Init_2 Py_PROTO((PyObject *));
+DL_IMPORT(PyObject *) _PyBuiltin_Init Py_PROTO((void));
 DL_IMPORT(PyObject *) _PySys_Init Py_PROTO((void));
 DL_IMPORT(void) _PyImport_Init Py_PROTO((void));
+DL_IMPORT(void) init_exceptions Py_PROTO((void));
 
 /* Various internal finalizers */
-DL_IMPORT(void) _PyImport_Fini Py_PROTO((void));
-DL_IMPORT(void) _PyBuiltin_Fini_1 Py_PROTO((void));
-DL_IMPORT(void) _PyBuiltin_Fini_2 Py_PROTO((void));
+DL_IMPORT(void) fini_exceptions Py_PROTO((void));
 DL_IMPORT(void) PyMethod_Fini Py_PROTO((void));
 DL_IMPORT(void) PyFrame_Fini Py_PROTO((void));
 DL_IMPORT(void) PyCFunction_Fini Py_PROTO((void));