Skip to content

Interop methods with Py_ssize_t works differently in NetCoreApp 2.0 #531

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

Merged
merged 3 commits into from
Oct 23, 2018
Merged

Interop methods with Py_ssize_t works differently in NetCoreApp 2.0 #531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f121c44
Interop fix for Py_ssize_t methods (it's produces problems only on Ne…
Aug 27, 2017
e4d10d6
Use long instead of int in all places that use Py_ssize_t
filmor Oct 19, 2018
1e41038
Merge branch 'master' into py_ssize_t-fix
den-run-ai Oct 20, 2018
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
Interop fix for Py_ssize_t methods (it's produces problems only on Ne… 
…tCoreApp 2.0).
  • Loading branch information
@filmor
dse authored and filmor committed Oct 19, 2018
commit f121c44a04f77a02f9b98df798dae91dd7aa8ee0
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
- Fixed Visual Studio 2017 compat ([#434][i434]) for setup.py
- Fixed crashes when integrating pythonnet in Unity3d ([#714][i714]),
related to unloading the Application Domain
- Fixed interop methods with Py_ssize_t. NetCoreApp 2.0 is more sensitive than net40 and requires this fix. ([#531][p531])
- Fixed crash on exit of the Python interpreter if a python class
derived from a .NET class has a `__namespace__` or `__assembly__`
attribute ([#481][i481])
Expand Down Expand Up @@ -688,3 +689,4 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
[p163]: https://github.com/pythonnet/pythonnet/pull/163
[p625]: https://github.com/pythonnet/pythonnet/pull/625
[i131]: https://github.com/pythonnet/pythonnet/issues/131
[p531]: https://github.com/pythonnet/pythonnet/pull/531
6 changes: 2 additions & 4 deletions src/embed_tests/TestPySequence.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@ public void TestRepeat()
PyObject actual = t1.Repeat(3);
Assert.AreEqual("FooFooFoo", actual.ToString());

// On 32 bit system this argument should be int, but on the 64 bit system this should be long value.
// This works on the Framework 4.0 accidentally, it should produce out of memory!
// actual = t1.Repeat(-3);
// Assert.AreEqual("", actual.ToString());
actual = t1.Repeat(-3);
Assert.AreEqual("", actual.ToString());
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/exceptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public static void SetError(Exception e)
/// </remarks>
public static bool ErrorOccurred()
{
return Runtime.PyErr_Occurred() != 0;
return Runtime.PyErr_Occurred() != IntPtr.Zero;
}

/// <summary>
Expand Down
Loading