From 47606c2d7881d9bf462005eb76cb2c3441cedb9f Mon Sep 17 00:00:00 2001 From: Jhonathan Abreu Date: Tue, 21 Nov 2023 15:33:16 -0400 Subject: [PATCH 1/2] Add preventive measure to check for null python traceback for clr bubbled exceptions --- src/runtime/PythonException.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/runtime/PythonException.cs b/src/runtime/PythonException.cs index 0d55f188b..14a8d54d1 100644 --- a/src/runtime/PythonException.cs +++ b/src/runtime/PythonException.cs @@ -187,7 +187,8 @@ private static Exception FromPyErr(BorrowedReference typeRef, BorrowedReference if (exception is not null) { // Return ClrBubbledExceptions when they are bubbled from Python -> C# -> Python -> C# -> ... - if (exception is ClrBubbledException) + // or when the traceback is not available, so we fall back to the original behavior + if (exception is ClrBubbledException || traceback is null) { return exception; } From 1a0f650e320db785ac01ac0730b83e53651242c2 Mon Sep 17 00:00:00 2001 From: Jhonathan Abreu Date: Tue, 21 Nov 2023 15:53:02 -0400 Subject: [PATCH 2/2] Bump version to 2.0.25 --- src/perf_tests/Python.PerformanceTests.csproj | 4 ++-- src/runtime/Properties/AssemblyInfo.cs | 4 ++-- src/runtime/Python.Runtime.csproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/perf_tests/Python.PerformanceTests.csproj b/src/perf_tests/Python.PerformanceTests.csproj index 377afa9ef..09bab9176 100644 --- a/src/perf_tests/Python.PerformanceTests.csproj +++ b/src/perf_tests/Python.PerformanceTests.csproj @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + compile @@ -25,7 +25,7 @@ - + diff --git a/src/runtime/Properties/AssemblyInfo.cs b/src/runtime/Properties/AssemblyInfo.cs index 1a17fc422..a6413c82d 100644 --- a/src/runtime/Properties/AssemblyInfo.cs +++ b/src/runtime/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: InternalsVisibleTo("Python.EmbeddingTest, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")] [assembly: InternalsVisibleTo("Python.Test, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")] -[assembly: AssemblyVersion("2.0.24")] -[assembly: AssemblyFileVersion("2.0.24")] +[assembly: AssemblyVersion("2.0.25")] +[assembly: AssemblyFileVersion("2.0.25")] diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj index c49e62bb5..3254f1b97 100644 --- a/src/runtime/Python.Runtime.csproj +++ b/src/runtime/Python.Runtime.csproj @@ -5,7 +5,7 @@ Python.Runtime Python.Runtime QuantConnect.pythonnet - 2.0.24 + 2.0.25 false LICENSE https://github.com/pythonnet/pythonnet