explicitly raise an instanceless exception for testing in Python 3.12

losttech · Oct 3, 2023 · b3a012a · b3a012a
1 parent 171cee4
commit b3a012a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/embed_tests/Codecs.cs b/src/embed_tests/Codecs.cs
@@ -373,8 +373,10 @@ public void ExceptionDecodedNoInstance()
         {
             PyObjectConversions.RegisterDecoder(new InstancelessExceptionDecoder());
             using var scope = Py.CreateScope();
-            var error = Assert.Throws<ValueErrorWrapper>(() => PythonEngine.Exec(
-                $"[].__iter__().__next__()"));
+            var error = Assert.Throws<ValueErrorWrapper>(() => PythonEngine.Exec(@$"
+from {typeof(TestPythonException).Namespace} import {nameof(TestPythonException)}
+
+{nameof(TestPythonException)}.{nameof(TestPythonException.RaiseInstanceless)}()"));
             Assert.AreEqual(TestExceptionMessage, error.Message);
         }
 

diff --git a/src/embed_tests/TestPythonException.cs b/src/embed_tests/TestPythonException.cs
@@ -176,5 +176,11 @@ public void TestPythonException_Normalize_ThrowsWhenErrorSet()
             Assert.Throws<InvalidOperationException>(() => pythonException.Normalize());
             Exceptions.Clear();
         }
+
+        public static void RaiseInstanceless()
+        {
+            var stopIteration = new PyType(Exceptions.StopIteration);
+            throw new PythonException(stopIteration, value: null, traceback: null);
+        }
     }
 }
diff --git a/src/runtime/PythonException.cs b/src/runtime/PythonException.cs
@@ -283,7 +283,7 @@ private static string TracebackToString(PyObject traceback)
         /// <summary>Restores python error.</summary>
         internal void Restore()
         {
-            NewReference type = Type.NewReferenceOrNull();
+            NewReference type = new NewReference(Type);
             NewReference value = Value.NewReferenceOrNull();
             NewReference traceback = Traceback.NewReferenceOrNull();