added support for creating abstract classes using a __clr_abstract__ …

…attribute.
pythonnet · rmadsen-ks · Apr 27, 2022 · Apr 28, 2022 · Apr 29, 2022 · May 3, 2022
commit 2449bd210b76268e2986d1fd04122fd06369bd4d
diff --git a/src/python_tests_runner/PythonTestRunner.cs b/src/python_tests_runner/PythonTestRunner.cs
@@ -42,6 +42,7 @@ static IEnumerable<string[]> PythonTestCases()
             yield return new[] { "test_subclass", "test_class_with_attributes" };
             yield return new[] { "test_subclass", "test_class_with_advanced_attribute" };
             yield return new[] { "test_subclass", "test_more_subclasses" };
+            yield return new[] { "test_subclass", "abstract_test" };
         }
 
         /// <summary>

diff --git a/src/runtime/Types/ClassDerived.cs b/src/runtime/Types/ClassDerived.cs
@@ -280,8 +280,16 @@ internal static Type CreateDerivedType(string name,
                 baseClass = typeof(object);
             }
 
+            bool isAbstract = false;
+            if (py_dict != null && Runtime.PyDict_Check(py_dict))
+            {
+                using var dict = new PyDict(py_dict);
+                if (dict.HasKey("__clr_abstract__"))
+                    isAbstract = true;
+            }
+
             TypeBuilder typeBuilder = moduleBuilder.DefineType(name,
-                TypeAttributes.Public | TypeAttributes.Class,
+                TypeAttributes.Public | TypeAttributes.Class | (isAbstract ? TypeAttributes.Abstract : 0),
                 baseClass,
                 interfaces.ToArray());
 
@@ -359,6 +367,7 @@ internal static Type CreateDerivedType(string name,
             if (py_dict != null && Runtime.PyDict_Check(py_dict))
             {
                 using var dict = new PyDict(py_dict);
+
                 if (dict.HasKey("__clr_attributes__"))
                 {
                     var attributes = new PyList(dict["__clr_attributes__"]);

diff --git a/tests/test_subclass.py b/tests/test_subclass.py
@@ -376,7 +376,15 @@ def IncrementThing(self):
     obj = None
     SimpleClass.Test2()
 
-
+def abstract_test():
+    class abstractClass(SimpleClass):
+        __clr_abstract__ = True
+    failed = False
+    try:
+        abstractClass()
+    except:
+        failed = True
+    assert failed
 
 def test_construction_from_clr():
     import clr