From 17269090940aa20f6079a6b9f27ae319f8cdae14 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 5 Nov 2019 01:22:12 +0100 Subject: bpo-38644: Pass tstate to _Py_CheckFunctionResult() (GH-17050) * Add tstate parameter to _Py_CheckFunctionResult() * Add _PyErr_FormatFromCauseTstate() * Replace PyErr_XXX(...) with _PyErr_XXX(state, ...) --- Python/errors.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Python/errors.c') diff --git a/Python/errors.c b/Python/errors.c index b935341636..9658afeb9f 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -520,6 +520,21 @@ _PyErr_FormatVFromCause(PyThreadState *tstate, PyObject *exception, return NULL; } +PyObject * +_PyErr_FormatFromCauseTstate(PyThreadState *tstate, PyObject *exception, + const char *format, ...) +{ + va_list vargs; +#ifdef HAVE_STDARG_PROTOTYPES + va_start(vargs, format); +#else + va_start(vargs); +#endif + _PyErr_FormatVFromCause(tstate, exception, format, vargs); + va_end(vargs); + return NULL; +} + PyObject * _PyErr_FormatFromCause(PyObject *exception, const char *format, ...) { -- cgit v1.2.1