Skip to content

Python3: all integers are now 64 bits integers and so if the target is a 32 bit integer we must always do the conversion #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sweinst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python3: all integers are now 64 bits integers and so if the target is a 32 bit integer we must always do the conversion #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion pythonnet/src/runtime/converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,26 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
return true;

case TypeCode.Int32:
#if (PYTHON32 || PYTHON33 || PYTHON34)
// Python3 uses only 64 bits integers as ints
op = Runtime.PyNumber_Long(value);
if (op == IntPtr.Zero) {
if (Exceptions.ExceptionMatches(overflow)) {
goto overflow;
}
goto type_error;
}
long ll = (long)Runtime.PyLong_AsLongLong(op);
Runtime.Decref(op);
if ((ll == -1) && Exceptions.ErrorOccurred()) {
goto overflow;
}
if (ll > Int32.MaxValue || ll < Int32.MinValue) {
goto overflow;
}
result = (int)ll;
return true;
#else
// Trickery to support 64-bit platforms.
if (IntPtr.Size == 4) {
op = Runtime.PyNumber_Int(value);
Expand Down Expand Up @@ -444,7 +464,7 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
result = (int)ll;
return true;
}

#endif
case TypeCode.Boolean:
result = (Runtime.PyObject_IsTrue(value) != 0);
return true;
Expand Down