python 修复小于 3.12 版本下的异常处理 并精简异常信息

Author: realybin

unity/native/papi-python/include/PapiData.h

@@ -58,7 +58,25 @@ struct pesapi_value_ref__ : pesapi_env_ref__
 
 struct caught_exception_info
 {
-    PyObject* ex;
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
+    PyObject* value;
+#else
+    PyObject* type;
+    PyObject* value;
+    PyObject* traceback;
+#endif
+    ~caught_exception_info()
+    {
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
+        // From PyErr_GetRaisedException
+        Py_XDECREF(value);
+#else
+        // From PyErr_Fetch
+        Py_XDECREF(type);
+        Py_XDECREF(value);
+        Py_XDECREF(traceback);
+#endif
+    }
 };
 
 struct pesapi_scope__;
@@ -110,20 +128,34 @@ struct pesapi_scope__
         return ret;
     }
 
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
+    // From PyErr_GetRaisedException
     void setCaughtException(PyObject* ex)
     {
         if (caught == nullptr)
         {
             caught = (caught_exception_info*) PyMem_Malloc(sizeof(caught_exception_info));
         }
-        caught->ex = ex;
+        caught->value = ex;
+    }
+#else
+    // From PyErr_Fetch
+    void setCaughtException(PyObject * type, PyObject * value, PyObject * traceback)
+    {
+        if (caught == nullptr)
+        {
+            caught = (caught_exception_info*) PyMem_Malloc(sizeof(caught_exception_info));
+        }
+        caught->type = type;
+        caught->value = value;
+        caught->traceback = traceback;
     }
+#endif
 
     ~pesapi_scope__()
     {
         if (caught)
         {
-            Py_XDECREF(caught->ex);
             caught->~caught_exception_info();
             PyMem_Free(caught);
         }

unity/native/papi-python/source/PapiPythonImpl.cpp

@@ -602,23 +602,32 @@ const char* pesapi_get_exception_as_string(pesapi_scope pscope, int with_stack)
     {
         return nullptr;
     }
-    auto ex = scope->caught->ex;
     auto globals = PyModule_GetDict(PyImport_AddModule("__main__"));
-    PyDict_SetItem(globals, PyUnicode_FromString("__pesapi_last_exception"), ex);
+
+    PyDict_SetItem(globals, PyUnicode_FromString("__pesapi_last_exception"), scope->caught->value);
+#if !(PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12)
+    PyDict_SetItem(globals, PyUnicode_FromString("__pesapi_last_exception"), scope->caught->value);
+    PyDict_SetItem(globals, PyUnicode_FromString("__pesapi_last_exception_tp"), scope->caught->type);
+    PyDict_SetItem(globals, PyUnicode_FromString("__pesapi_last_exception_tb"), scope->caught->traceback);
+#endif
+
     const char* ret;
     if (with_stack)
     {
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
         PyRun_SimpleString(
             "import traceback\n"
-            "try:\n"
-            "    raise __pesapi_last_exception\n"
-            "except Exception as e:\n"
-            "    __pesapi_last_exception_str = ''.join(traceback.format_exception(type(e), e, e.__traceback__))\n");
+            "__pesapi_last_exception_str = ''.join(traceback.format_exception(type(__pesapi_last_exception), __pesapi_last_exception, __pesapi_last_exception.__traceback__))\n");
+#else
+        PyRun_SimpleString(
+            "import traceback\n"
+            "__pesapi_last_exception_str = ''.join(traceback.format_exception(__pesapi_last_exception_tp, __pesapi_last_exception, __pesapi_last_exception_tb))\n");
+#endif
         ret = PyUnicode_AsUTF8(PyDict_GetItem(globals, PyUnicode_FromString("__pesapi_last_exception_str")));
     }
     else
     {
-        ret = PyUnicode_AsUTF8(PyObject_Str(ex));
+        ret = PyUnicode_AsUTF8(PyObject_Str(scope->caught->value));
     }
     PyDict_DelItemString(globals, "__pesapi_last_exception");
     return ret;
@@ -780,16 +789,13 @@ pesapi_value pesapi_call_function(
     else
     {
         auto scope = (pesapi_scope__*)mapper->getCurrentScope();
-#if PY_VERSION_HEX >= 0x030B0000
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
         scope->setCaughtException(PyErr_GetRaisedException());
 #else
         {
-            PyObject *type = nullptr, *value = nullptr, *tb = nullptr;
-            PyErr_Fetch(&type, &value, &tb);
-            PyObject *exc = value ? value : type;
-            if (exc) Py_XINCREF(exc);
-            PyErr_Restore(type, value, tb);
-            scope->setCaughtException(exc);
+            PyObject *type = nullptr, *value = nullptr, *traceback = nullptr;
+            PyErr_Fetch(&type, &value, &traceback);
+            scope->setCaughtException(type, value, traceback);
         }
 #endif
         return nullptr;
@@ -816,16 +822,13 @@ pesapi_value pesapi_eval(pesapi_env env, const uint8_t* code, size_t code_size,
         }
     }
     auto scope = (pesapi_scope__*)mapper->getCurrentScope();
-#if PY_VERSION_HEX >= 0x030B0000
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
     scope->setCaughtException(PyErr_GetRaisedException());
 #else
     {
-        PyObject *type = nullptr, *value = nullptr, *tb = nullptr;
-        PyErr_Fetch(&type, &value, &tb);
-        PyObject *exc = value ? value : type;
-        if (exc) Py_XINCREF(exc);
-        PyErr_Restore(type, value, tb);
-        scope->setCaughtException(exc);
+        PyObject *type = nullptr, *value = nullptr, *traceback = nullptr;
+        PyErr_Fetch(&type, &value, &traceback);
+        scope->setCaughtException(type, value, traceback);
     }
 #endif
     return nullptr;

unity/native/papi-python/test/papi_py_base_test.cpp

@@ -427,7 +427,7 @@ TEST_F(PApiBaseTest, EvalJavaScriptEx)
 
     EXPECT_STREQ("abc", apis->get_exception_as_string(scope, false));
     EXPECT_STREQ(
-        "Traceback (most recent call last):\n  File \"<string>\", line 3, in <module>\n  File \"test.py\", line 1, in <module>\n  "
+        "Traceback (most recent call last):\n  File \"test.py\", line 1, in <module>\n  "
         "File \"test.py\", line 1, in <lambda>\n  File \"test.py\", line 1, in <genexpr>\nException: abc\n",
         apis->get_exception_as_string(scope, true));
 }