Ensure TypeError use raise_from for C++->Python overload res. (#3671)

Skylion007 · web-flow · commit ce18721d830a · 2022-01-31T15:13:05.000-05:00
diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
@@ -988,6 +988,13 @@ class cpp_function : public function {
             }
 
             append_note_if_missing_header_is_suspected(msg);
+#if PY_VERSION_HEX >= 0x03030000
+            // Attach additional error info to the exception if supported
+            if (PyErr_Occurred()) {
+                raise_from(PyExc_TypeError, msg.c_str());
+                return nullptr;
+            }
+#endif
             PyErr_SetString(PyExc_TypeError, msg.c_str());
             return nullptr;
         }

Original file line number	Diff line number	Diff line change
`@@ -988,6 +988,13 @@ class cpp_function : public function {`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`append_note_if_missing_header_is_suspected(msg);`
	`991`	`+#if PY_VERSION_HEX >= 0x03030000`
	`992`	`+ // Attach additional error info to the exception if supported`
	`993`	`+ if (PyErr_Occurred()) {`
	`994`	`+ raise_from(PyExc_TypeError, msg.c_str());`
	`995`	`+ return nullptr;`
	`996`	`+ }`
	`997`	`+#endif`
`991`	`998`	`PyErr_SetString(PyExc_TypeError, msg.c_str());`
`992`	`999`	`return nullptr;`
`993`	`1000`	`}`