From c456dfafe9f9f6614fbcf2213a93707f0e101f4e Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Thu, 25 Nov 2021 09:41:28 +0000
Subject: bpo-45711: use exc_value instead of exc_type to determine if exc_info
 is valid. Add more assertions. (GH-29627)

---
 Python/pystate.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Python/pystate.c')

diff --git a/Python/pystate.c b/Python/pystate.c
index 56db095d24..ba14c9d8af 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1341,11 +1341,7 @@ _PyThread_CurrentExceptions(void)
             if (id == NULL) {
                 goto fail;
             }
-            PyObject *exc_info = PyTuple_Pack(
-                3,
-                err_info->exc_type != NULL ? err_info->exc_type : Py_None,
-                err_info->exc_value != NULL ? err_info->exc_value : Py_None,
-                err_info->exc_traceback != NULL ? err_info->exc_traceback : Py_None);
+            PyObject *exc_info = _PyErr_StackItemToExcInfoTuple(err_info);
             if (exc_info == NULL) {
                 Py_DECREF(id);
                 goto fail;
-- 
cgit v1.2.1