diff options
| author | Victor Stinner <vstinner@python.org> | 2023-08-29 03:13:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 03:13:41 (GMT) |
| commit | c9eefc77a7456c5354beaff9bdba449d3e42be35 (patch) | |
| tree | 24d3949af294b2fdee0b20101eb26b51f93dfa04 | |
| parent | 921eb8ebf6ae9bd359bc03c24bf1f7537bb498ab (diff) | |
| download | cpython-c9eefc77a7456c5354beaff9bdba449d3e42be35.zip cpython-c9eefc77a7456c5354beaff9bdba449d3e42be35.tar.gz cpython-c9eefc77a7456c5354beaff9bdba449d3e42be35.tar.bz2 | |
gh-106320: Remove private _PyErr_SetKeyError() (#108607)
Move the private _PyErr_SetKeyError() function to the internal C API
(pycore_pyerrors.h).
| -rw-r--r-- | Include/cpython/pyerrors.h | 4 | ||||
| -rw-r--r-- | Include/internal/pycore_pyerrors.h | 4 | ||||
| -rw-r--r-- | Objects/setobject.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Include/cpython/pyerrors.h b/Include/cpython/pyerrors.h index 5c12821..cbe3be1 100644 --- a/Include/cpython/pyerrors.h +++ b/Include/cpython/pyerrors.h @@ -88,10 +88,6 @@ typedef PyOSErrorObject PyEnvironmentErrorObject; typedef PyOSErrorObject PyWindowsErrorObject; #endif -/* Error handling definitions */ - -PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *); - /* Context manipulation (PEP 3134) */ Py_DEPRECATED(3.12) PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *); diff --git a/Include/internal/pycore_pyerrors.h b/Include/internal/pycore_pyerrors.h index 5d2ad50..0bc2058 100644 --- a/Include/internal/pycore_pyerrors.h +++ b/Include/internal/pycore_pyerrors.h @@ -16,6 +16,10 @@ extern PyObject* _PyErr_GetHandledException(PyThreadState *); extern void _PyErr_SetHandledException(PyThreadState *, PyObject *); extern void _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, PyObject **); +// Export for '_testinternalcapi' shared extension +PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *); + + // Like PyErr_Format(), but saves current exception as __context__ and // __cause__. // Export for '_sqlite3' shared extension. diff --git a/Objects/setobject.c b/Objects/setobject.c index 14b53c1..6051e57 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -36,6 +36,7 @@ #include "pycore_dict.h" // _PyDict_Contains_KnownHash() #include "pycore_modsupport.h" // _PyArg_NoKwnames() #include "pycore_object.h" // _PyObject_GC_UNTRACK() +#include "pycore_pyerrors.h" // _PyErr_SetKeyError() #include "pycore_setobject.h" // _PySet_NextEntry() definition #include <stddef.h> // offsetof() |