Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
1776 Generic Virtual Method Causes Invalid Program: Fix + test
- If a method is virtual AND generic, it cannot be overridden by the python class. Hence the method call is deferred to the base class.
- Added a unit test which verifies this behavior is now working.
  • Loading branch information
rmadsen-ks committed Nov 29, 2022
commit d4e3c18a824b8e957c04b8a569e8ff857f71094e
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

### Fixed

- Fixed error occuring when inheriting a class containing a virtual generic method.

## [3.0.1](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.1) - 2022-11-03

### Added
Expand Down
1 change: 1 addition & 0 deletions src/python_tests_runner/PythonTestRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ static IEnumerable<string[]> PythonTestCases()
// Add the test that you want to debug here.
yield return new[] { "test_indexer", "test_boolean_indexer" };
yield return new[] { "test_delegate", "test_bool_delegate" };
yield return new[] { "test_subclass", "test_virtual_generic_method" };
Comment thread
lostmsu marked this conversation as resolved.
Outdated
}

/// <summary>
Expand Down
5 changes: 4 additions & 1 deletion src/runtime/Types/ClassDerived.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,10 @@ internal static Type CreateDerivedType(string name,
foreach (MethodInfo method in methods)
{
if (!method.Attributes.HasFlag(MethodAttributes.Virtual) |
method.Attributes.HasFlag(MethodAttributes.Final))
method.Attributes.HasFlag(MethodAttributes.Final)
// overriding generic virtual methods is not supported
// so a call to that should be deferred to the base class method.
|| method.IsGenericMethod)
{
continue;
}
Expand Down
8 changes: 8 additions & 0 deletions src/testing/generictest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,12 @@ public static T[] EchoRange<T>(T[] items)
return items;
}
}

public abstract class GenericVirtualMethodTest
{
public virtual Q VirtMethod<Q>(Q arg1)
{
return arg1;
}
}
}
14 changes: 13 additions & 1 deletion tests/test_subclass.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import System
import pytest
from Python.Test import (IInterfaceTest, SubClassTest, EventArgsTest,
FunctionsTest, IGenericInterface)
FunctionsTest, IGenericInterface, GenericVirtualMethodTest)
from System.Collections.Generic import List


Expand Down Expand Up @@ -327,3 +327,15 @@ def test_generic_interface():
obj = GenericInterfaceImpl()
SpecificInterfaceUser(obj, Int32(0))
GenericInterfaceUser[Int32](obj, Int32(0))

def test_virtual_generic_method():
class OverloadingSubclass(GenericVirtualMethodTest):
__namespace__ = "test_virtual_generic_method_cls"
class OverloadingSubclass2(OverloadingSubclass):
__namespace__ = "test_virtual_generic_method_cls"
obj = OverloadingSubclass()
assert obj.VirtMethod[int](5) == 5
obj = OverloadingSubclass2()
assert obj.VirtMethod[int](5) == 5