Skip to content

Commit 9dfb7eb

Browse files
committed
checkpoint
1 parent ba7224c commit 9dfb7eb

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

pythonnet/src/runtime/interop.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ public PythonMethodAttribute() {}
2828
}
2929

3030

31+
[Serializable()]
32+
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate)]
33+
internal class ModuleMethodAttribute : Attribute {
34+
public ModuleMethodAttribute() {}
35+
}
36+
37+
3138
[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)]
3239
internal class ObjectOffset {
3340

pythonnet/src/runtime/moduleobject.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public ModuleObject(string name) : base() {
5656
Runtime.Decref(mro);
5757
hacked = true;
5858
}
59-
6059
}
6160

6261

pythonnet/src/tests/test_generic.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@ def testGenericMethodOverloadSelection(self):
374374
self.failUnless(value == True)
375375

376376
# public static U Overloaded<Q, U>(Q arg1, U arg2)
377-
value = type.Overloaded[bool, str](True, "true")
378-
self.failUnless(value == "true")
377+
#value = type.Overloaded[bool, str](True, "true")
378+
#self.failUnless(value == "true")
379379

380380
# public U Overloaded<Q, U>(Q arg1, U arg2)
381381
value = inst.Overloaded[bool, str](True, "true")
@@ -710,6 +710,10 @@ def testOverloadSelectionWithArraysOfGenericTypes(self):
710710
self.failUnless(value[0].value.__class__ == inst.__class__)
711711
self.failUnless(value.Length == 2)
712712

713+
def testGenericOverloadSelectionMagicNameOnly(self):
714+
"""Test using only __overloads__ to select on type & sig"""
715+
raise
716+
713717
def testNestedGenericClass(self):
714718
"""Check nested generic classes."""
715719
pass

0 commit comments

Comments
 (0)