Commit bfce5e2
Fix missing Incref for Namespace and Assembly (pythonnet#482)
Fix crash of python interpreter 3.5 64-bit in garbage collector1 parent 550a027 commit bfce5e2
4 files changed
Lines changed: 9 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -43,3 +43,5 @@ | |||
| 43 | 43 | - ([@rico-chet](https://github.com/rico-chet)) | |
| 44 | 44 | - ([@rmadsen-ks](https://github.com/rmadsen-ks)) | |
| 45 | 45 | - ([@stonebig](https://github.com/stonebig)) | |
| 46 | + - ([@testrunner123](https://github.com/testrunner123)) | ||
| 47 | + | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,19 +8,18 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. | |||
| 8 | 8 | ## [unreleased][] | |
| 9 | 9 | ||
| 10 | 10 | ### Added | |
| 11 | - - Added clr.GetClrType (#432)(#433) | ||
| 12 | - - Allowed passing None for nullable args (#460) | ||
| 11 | + - Added `clr.GetClrType` (#432, #433) | ||
| 12 | + - Allowed passing `None` for nullable args (#460) | ||
| 13 | 13 | - Added keyword arguments based on C# syntax for calling CPython methods (#461) | |
| 14 | 14 | ||
| 15 | - | ||
| 16 | 15 | ### Changed | |
| 17 | 16 | ||
| 18 | - - Changed `Bar` feature | ||
| 19 | - | ||
| 20 | 17 | ### Fixed | |
| 21 | 18 | ||
| 22 | 19 | - Fixed Visual Studio 2017 compat (#434) for setup.py | |
| 23 | - - Fixed `FooBar` bug | ||
| 20 | + - Fixed crash on exit of the Python interpreter if a python class | ||
| 21 | + derived from a .NET class has a `__namespace__` or `__assembly__` | ||
| 22 | + attribute (#481) | ||
| 24 | 23 | ||
| 25 | 24 | ## [2.3.0][] - 2017-03-11 | |
| 26 | 25 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -206,6 +206,7 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr | |||
| 206 | 206 | if (0 != Runtime.PyMapping_HasKey(py_dict, assemblyKey.Handle)) | |
| 207 | 207 | { | |
| 208 | 208 | var pyAssembly = new PyObject(Runtime.PyDict_GetItem(py_dict, assemblyKey.Handle)); | |
| 209 | + Runtime.XIncref(pyAssembly.Handle); | ||
| 209 | 210 | disposeList.Add(pyAssembly); | |
| 210 | 211 | if (!Converter.ToManagedValue(pyAssembly.Handle, typeof(string), out assembly, false)) | |
| 211 | 212 | { | |
@@ -218,6 +219,7 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr | |||
| 218 | 219 | if (0 != Runtime.PyMapping_HasKey(py_dict, namespaceKey.Handle)) | |
| 219 | 220 | { | |
| 220 | 221 | var pyNamespace = new PyObject(Runtime.PyDict_GetItem(py_dict, namespaceKey.Handle)); | |
| 222 | + Runtime.XIncref(pyNamespace.Handle); | ||
| 221 | 223 | disposeList.Add(pyNamespace); | |
| 222 | 224 | if (!Converter.ToManagedValue(pyNamespace.Handle, typeof(string), out namespaceStr, false)) | |
| 223 | 225 | { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -85,7 +85,6 @@ def OnTestEvent(self, value): | |||
| 85 | 85 | return DerivedEventTest | |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | - @pytest.mark.skip(reason="FIXME: test randomly pass/fails") | ||
| 89 | 88 | def test_base_class(): | |
| 90 | 89 | """Test base class managed type""" | |
| 91 | 90 | ob = SubClassTest() | |
@@ -98,7 +97,6 @@ def test_base_class(): | |||
| 98 | 97 | assert list(SubClassTest.test_list(ob)) == ["a", "b", "c"] | |
| 99 | 98 | ||
| 100 | 99 | ||
| 101 | - @pytest.mark.skip(reason="FIXME: test randomly pass/fails") | ||
| 102 | 100 | def test_interface(): | |
| 103 | 101 | """Test python classes can derive from C# interfaces""" | |
| 104 | 102 | InterfaceTestClass = interface_test_class_fixture() | |
@@ -112,7 +110,6 @@ def test_interface(): | |||
| 112 | 110 | assert id(x) == id(ob) | |
| 113 | 111 | ||
| 114 | 112 | ||
| 115 | - @pytest.mark.skip(reason="FIXME: test randomly pass/fails") | ||
| 116 | 113 | def test_derived_class(): | |
| 117 | 114 | """Test python class derived from managed type""" | |
| 118 | 115 | DerivedClass = derived_class_fixture() | |
0 commit comments