Improved AttributeError when looking for a symbol that does not exist…

… inside a .NET module.
pythonnet · rmadsen-ks · Apr 27, 2022 · Apr 28, 2022 · Apr 29, 2022 · May 3, 2022
commit 7980fc4cf5cddab41856d181f57274568def9d3c
diff --git a/src/python_tests_runner/PythonTestRunner.cs b/src/python_tests_runner/PythonTestRunner.cs
@@ -18,7 +18,7 @@ public class PythonTestRunner
         public void SetUp()
         {
             Python.Runtime.Runtime.PythonDLL =
-                "/Library/Frameworks/Python.framework/Versions/3.10/lib/libpython3.10.dylib";
+                "C:\\Python37.2\\python37.dll";
             PythonEngine.Initialize();
         }
 

diff --git a/src/runtime/Types/ClassDerived.cs b/src/runtime/Types/ClassDerived.cs
@@ -871,6 +871,7 @@ public class PythonDerivedType
         internal static Dictionary<PyObject, List<PyTuple>> methodAssoc = new Dictionary<PyObject, List<PyTuple>>();
         public static void PushAttribute(PyObject obj)
         {
+            using var _ = Py.GIL();
             var tp = new PyTuple(obj);
             attributesStack.Add(tp);
         }

diff --git a/src/runtime/Types/ModuleObject.cs b/src/runtime/Types/ModuleObject.cs
@@ -339,7 +339,7 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
 
             if (attr.IsNull())
             {
-                Exceptions.SetError(Exceptions.AttributeError, name);
+                Exceptions.SetError(Exceptions.AttributeError, $"name '{name}' is not defined in module '{self.moduleName}'.");
                 return default;
             }
 

diff --git a/src/testing/subclasstest.cs b/src/testing/subclasstest.cs
@@ -130,7 +130,10 @@ public interface ISimpleInterface
     {
         bool Ok();
     }
-
+    public interface ISimpleInterface2
+    {
+        int Execute(CancellationToken token);
+    }
     public class TestAttributeAttribute: Attribute
     {
         public int X { get; set; }
@@ -168,6 +171,10 @@ public static void TestObject(object obj)
                 if (!si.Ok())
                     throw new Exception();
 
+            }else if (obj is ISimpleInterface2 si2)
+            {
+                si2.Execute(CancellationToken.None);
+
             }
             else
             {

diff --git a/tests/test_subclass.py b/tests/test_subclass.py
@@ -10,9 +10,11 @@
 from System import (Console, Attribute, Double)
 from System.Diagnostics import (DebuggerDisplay, DebuggerDisplayAttribute, Debug)
 from System.ComponentModel import (Browsable, BrowsableAttribute)
+from System.Threading import (CancellationToken)
 import pytest
 from Python.Test import (IInterfaceTest, SubClassTest, EventArgsTest,
-                         FunctionsTest, GenericVirtualMethodTest, ISimpleInterface, SimpleClass, TestAttribute, TestAttributeAttribute)
+                         FunctionsTest, GenericVirtualMethodTest, ISimpleInterface, SimpleClass, TestAttribute, TestAttributeAttribute, ISimpleInterface2)
+import Python.Test
 from System.Collections.Generic import List
 
 
@@ -290,12 +292,26 @@ def Ok(self):
     class DualSubClass2(ISimpleInterface):
         def Ok(self):
             return True
+    class DualSubClass3(ISimpleInterface2):
+        def Execute(self, cancellationToken):
+            return 0
+    try:
+        class DualSubClass4(Python.Test.ISimpleInterface3):
+            def Execute(self, cancellationToken):
+                return 0
+        assert False # An exception should be thrown.
+    except AttributeError as ae:
+        assert ("not defined" in str(ae))
 
     obj = DualSubClass()
     SimpleClass.TestObject(obj)
     obj = DualSubClass2()
     SimpleClass.TestObject(obj)
 
+    obj2 = DualSubClass3();
+    SimpleClass.TestObject(obj2)
+    #obj2.Execute(CancellationToken.None)
+
 def test_class_with_attributes():
     import clr
     @clr.attribute(Browsable(False))