diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2023-05-01 21:08:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 21:08:34 (GMT) |
| commit | 59bc36aacddd5a3acd32c80c0dfd0726135a7817 (patch) | |
| tree | 820c3ab005019714344dadf0f10fa9c359ea30c7 /Python | |
| parent | d448fcb0323bf00cb4ff4a1e65e8424a73b5f0d4 (diff) | |
| download | cpython-59bc36aacddd5a3acd32c80c0dfd0726135a7817.zip cpython-59bc36aacddd5a3acd32c80c0dfd0726135a7817.tar.gz cpython-59bc36aacddd5a3acd32c80c0dfd0726135a7817.tar.bz2 | |
gh-84436: Immortalize in _PyStructSequence_InitBuiltinWithFlags() (gh-104054)
This also does some cleanup.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/errors.c | 4 | ||||
| -rw-r--r-- | Python/sysmodule.c | 10 | ||||
| -rw-r--r-- | Python/thread.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Python/errors.c b/Python/errors.c index 7fc2673..ce72049 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -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); } diff --git a/Python/sysmodule.c b/Python/sysmodule.c index d673e40..81dabe6 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -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 diff --git a/Python/thread.c b/Python/thread.c index 7fdedb0..f90cd34 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -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); } |