FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Implicit float conversion in function calls by filmor · Pull Request #1908 · pythonnet/pythonnet · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .cs  (2) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion src/runtime/Converter.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
{
if (Runtime.Is32Bit)
{
if (!Runtime.PyLong_Check(value))
if (!Runtime.PyInt_Check(value))
{
goto type_error;
}
Expand Down
9 changes: 1 addition & 8 deletions src/runtime/Runtime.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1101,11 +1101,6 @@ internal static bool PyBool_Check(BorrowedReference ob)

internal static NewReference PyInt_FromInt64(long value) => PyLong_FromLongLong(value);

internal static bool PyLong_Check(BorrowedReference ob)
{
return PyObject_TYPE(ob) == PyLongType;
}

internal static NewReference PyLong_FromLongLong(long value) => Delegates.PyLong_FromLongLong(value);


Expand Down Expand Up @@ -1145,9 +1140,7 @@ internal static NewReference PyLong_FromString(string value, int radix)
}

internal static bool PyFloat_Check(BorrowedReference ob)
{
return PyObject_TYPE(ob) == PyFloatType;
}
=> PyObject_TypeCheck(ob, PyFloatType);

/// <summary>
/// Return value: New reference.
Expand Down
38 changes: 38 additions & 0 deletions tests/test_method.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1256,3 +1256,41 @@ def test_method_encoding():
def test_method_with_pointer_array_argument():
with pytest.raises(TypeError):
MethodTest.PointerArray([0])

def test_method_call_implicit_conversion():

class IntAnswerMixin:
# For Python >= 3.8
def __index__(self):
return 42

# For Python < 3.10
def __int__(self):
return 42

class Answer(int, IntAnswerMixin):
pass

class FloatAnswer(float, IntAnswerMixin):
def __float__(self):
return 42.0

# TODO: This should also work for integer types but due to some complexities
# in the C-API functions (some call __int__/__index__, some don't), it's not
# supported, yet.
for v in [Answer(), FloatAnswer()]:
for t in [System.Double, System.Single]:
min_value = t(t.MinValue)
compare_to = min_value.CompareTo.__overloads__[t]

assert compare_to(v) == -1

class SomeNonFloat:
def __float__(self):
return 42.0

for t in [System.Double, System.Single]:
with pytest.raises(TypeError):
min_value = t(t.MinValue)
compare_to = min_value.CompareTo.__overloads__[t]
assert compare_to(SomeNonFloat()) == -1

Back | FazBrowse Home | New Git URL