mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
Merge remote-tracking branch 'origin/main' into HEAD
This commit is contained in:
commit
8d57aca95a
1284 changed files with 27792 additions and 11927 deletions
|
|
@ -506,6 +506,7 @@ pycore_init_runtime(_PyRuntimeState *runtime,
|
|||
_PyRuntimeState_SetFinalizing(runtime, NULL);
|
||||
|
||||
_Py_InitVersion();
|
||||
_Py_DumpTraceback_Init();
|
||||
|
||||
status = _Py_HashRandomization_Init(config);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
|
|
@ -836,6 +837,10 @@ pycore_init_builtins(PyThreadState *tstate)
|
|||
}
|
||||
interp->callable_cache.object__getattribute__ = object__getattribute__;
|
||||
|
||||
if (_PyType_InitSlotDefs(interp) < 0) {
|
||||
return _PyStatus_ERR("failed to init slotdefs");
|
||||
}
|
||||
|
||||
if (_PyBuiltins_AddExceptions(bimod) < 0) {
|
||||
return _PyStatus_ERR("failed to add exceptions to builtins");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue