mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
gh-84436: Immortalize in _PyStructSequence_InitBuiltinWithFlags() (gh-104054)
This also does some cleanup.
This commit is contained in:
parent
d448fcb032
commit
59bc36aacd
8 changed files with 74 additions and 59 deletions
|
@ -6,7 +6,7 @@
|
|||
#include "pycore_initconfig.h" // _PyStatus_ERR()
|
||||
#include "pycore_pyerrors.h" // _PyErr_Format()
|
||||
#include "pycore_pystate.h" // _PyThreadState_GET()
|
||||
#include "pycore_structseq.h" // _PyStructSequence_FiniType()
|
||||
#include "pycore_structseq.h" // _PyStructSequence_FiniBuiltin()
|
||||
#include "pycore_sysmodule.h" // _PySys_Audit()
|
||||
#include "pycore_traceback.h" // _PyTraceBack_FromFrame()
|
||||
|
||||
|
@ -1357,7 +1357,7 @@ _PyErr_FiniTypes(PyInterpreterState *interp)
|
|||
return;
|
||||
}
|
||||
|
||||
_PyStructSequence_FiniType(&UnraisableHookArgsType);
|
||||
_PyStructSequence_FiniBuiltin(&UnraisableHookArgsType);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3492,13 +3492,13 @@ void
|
|||
_PySys_Fini(PyInterpreterState *interp)
|
||||
{
|
||||
if (_Py_IsMainInterpreter(interp)) {
|
||||
_PyStructSequence_FiniType(&VersionInfoType);
|
||||
_PyStructSequence_FiniType(&FlagsType);
|
||||
_PyStructSequence_FiniBuiltin(&VersionInfoType);
|
||||
_PyStructSequence_FiniBuiltin(&FlagsType);
|
||||
#if defined(MS_WINDOWS)
|
||||
_PyStructSequence_FiniType(&WindowsVersionType);
|
||||
_PyStructSequence_FiniBuiltin(&WindowsVersionType);
|
||||
#endif
|
||||
_PyStructSequence_FiniType(&Hash_InfoType);
|
||||
_PyStructSequence_FiniType(&AsyncGenHooksType);
|
||||
_PyStructSequence_FiniBuiltin(&Hash_InfoType);
|
||||
_PyStructSequence_FiniBuiltin(&AsyncGenHooksType);
|
||||
#ifdef __EMSCRIPTEN__
|
||||
Py_CLEAR(EmscriptenInfoType);
|
||||
#endif
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
||||
#include "pycore_structseq.h" // _PyStructSequence_FiniType()
|
||||
#include "pycore_structseq.h" // _PyStructSequence_FiniBuiltin()
|
||||
#include "pycore_pythread.h"
|
||||
|
||||
#ifndef DONT_HAVE_STDIO_H
|
||||
|
@ -195,5 +195,5 @@ _PyThread_FiniType(PyInterpreterState *interp)
|
|||
return;
|
||||
}
|
||||
|
||||
_PyStructSequence_FiniType(&ThreadInfoType);
|
||||
_PyStructSequence_FiniBuiltin(&ThreadInfoType);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue