pythonnet · lostmsu · Dec 14, 2021 · Oct 17, 2021 · Oct 17, 2021 · Oct 17, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,6 +65,7 @@ One must now either use enum members (e.g. `MyEnum.Option`), or use enum constru
 -   BREAKING: Names of .NET types (e.g. `str(__class__)`) changed to better support generic types
 -   BREAKING: overload resolution will no longer prefer basic types. Instead, first matching overload will
 be chosen.
+-   BREAKING: `Exec` and `Eval` from `PythonEngine` no longer accept raw pointers.
 -   BREAKING: .NET collections and arrays are no longer automatically converted to
 Python collections. Instead, they implement standard Python
 collection interfaces from `collections.abc`.
@@ -74,6 +75,7 @@ be of type `PyInt` instead of `System.Int32` due to possible loss of information
 Python `float` will continue to be converted to `System.Double`.
 -   BREAKING: Python.NET will no longer implicitly convert types like `numpy.float64`, that implement `__float__` to
 `System.Single` and `System.Double`. An explicit conversion is required on Python or .NET side.
+-   BREAKING: `PyObject.GetHashCode` can fail.
 -   BREAKING: Python.NET will no longer implicitly convert any Python object to `System.Boolean`.
 -   BREAKING: `PyObject.GetAttr(name, default)` now only ignores `AttributeError` (previously ignored all exceptions).
 -   BREAKING: `PyObject` no longer implements `IEnumerable<PyObject>`.

diff --git a/pythonnet.sln b/pythonnet.sln
@@ -54,6 +54,9 @@ Global
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		TraceAlloc|Any CPU = TraceAlloc|Any CPU
+		TraceAlloc|x64 = TraceAlloc|x64
+		TraceAlloc|x86 = TraceAlloc|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -68,6 +71,12 @@ Global
 		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.Release|x64.Build.0 = Release|Any CPU
 		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.Release|x86.ActiveCfg = Release|Any CPU
 		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.Release|x86.Build.0 = Release|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|Any CPU.ActiveCfg = TraceAlloc|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|Any CPU.Build.0 = TraceAlloc|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|x64.ActiveCfg = Debug|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|x64.Build.0 = Debug|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|x86.ActiveCfg = Debug|Any CPU
+		{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}.TraceAlloc|x86.Build.0 = Debug|Any CPU
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Debug|Any CPU.Build.0 = Debug|x64
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Debug|x64.ActiveCfg = Debug|x64
@@ -80,6 +89,12 @@ Global
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release|x64.Build.0 = Release|x64
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release|x86.ActiveCfg = Release|x86
 		{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release|x86.Build.0 = Release|x86
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|Any CPU.ActiveCfg = Debug|x64
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|Any CPU.Build.0 = Debug|x64
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|x64.ActiveCfg = Debug|x64
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|x64.Build.0 = Debug|x64
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|x86.ActiveCfg = Debug|x86
+		{E6B01706-00BA-4144-9029-186AC42FBE9A}.TraceAlloc|x86.Build.0 = Debug|x86
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -92,6 +107,12 @@ Global
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Release|x64.Build.0 = Release|Any CPU
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Release|x86.ActiveCfg = Release|Any CPU
 		{819E089B-4770-400E-93C6-4F7A35F0EA12}.Release|x86.Build.0 = Release|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|Any CPU.ActiveCfg = Debug|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|Any CPU.Build.0 = Debug|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|x64.ActiveCfg = Debug|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|x64.Build.0 = Debug|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|x86.ActiveCfg = Debug|Any CPU
+		{819E089B-4770-400E-93C6-4F7A35F0EA12}.TraceAlloc|x86.Build.0 = Debug|Any CPU
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -104,6 +125,12 @@ Global
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Release|x64.Build.0 = Release|Any CPU
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Release|x86.ActiveCfg = Release|Any CPU
 		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.Release|x86.Build.0 = Release|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|Any CPU.ActiveCfg = Debug|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|Any CPU.Build.0 = Debug|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|x64.ActiveCfg = Debug|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|x64.Build.0 = Debug|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|x86.ActiveCfg = Debug|Any CPU
+		{14EF9518-5BB7-4F83-8686-015BD2CC788E}.TraceAlloc|x86.Build.0 = Debug|Any CPU
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Debug|Any CPU.Build.0 = Debug|x64
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Debug|x64.ActiveCfg = Debug|x64
@@ -116,6 +143,12 @@ Global
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Release|x64.Build.0 = Release|x64
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Release|x86.ActiveCfg = Release|x86
 		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.Release|x86.Build.0 = Release|x86
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|Any CPU.ActiveCfg = Debug|x64
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|Any CPU.Build.0 = Debug|x64
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|x64.ActiveCfg = Debug|x64
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|x64.Build.0 = Debug|x64
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|x86.ActiveCfg = Debug|x86
+		{4F2EA4A1-7ECA-48B5-8077-7A3C366F9931}.TraceAlloc|x86.Build.0 = Debug|x86
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -128,6 +161,12 @@ Global
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x64.Build.0 = Release|Any CPU
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.ActiveCfg = Release|Any CPU
 		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.Build.0 = Release|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|Any CPU.Build.0 = Debug|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|x64.ActiveCfg = Debug|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|x64.Build.0 = Debug|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|x86.ActiveCfg = Debug|Any CPU
+		{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.TraceAlloc|x86.Build.0 = Debug|Any CPU
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -140,6 +179,12 @@ Global
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Release|x64.Build.0 = Release|Any CPU
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Release|x86.ActiveCfg = Release|Any CPU
 		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.Release|x86.Build.0 = Release|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|Any CPU.ActiveCfg = Debug|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|Any CPU.Build.0 = Debug|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|x64.ActiveCfg = Debug|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|x64.Build.0 = Debug|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|x86.ActiveCfg = Debug|Any CPU
+		{35CBBDEB-FC07-4D04-9D3E-F88FC180110B}.TraceAlloc|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/embed_tests/CallableObject.cs b/src/embed_tests/CallableObject.cs
@@ -14,7 +14,7 @@ public void SetUp()
         {
             PythonEngine.Initialize();
             using var locals = new PyDict();
-            PythonEngine.Exec(CallViaInheritance.BaseClassSource, locals: locals.Handle);
+            PythonEngine.Exec(CallViaInheritance.BaseClassSource, locals: locals);
             CustomBaseTypeProvider.BaseClass = new PyType(locals[CallViaInheritance.BaseClassName]);
             PythonEngine.InteropConfiguration.PythonBaseTypeProviders.Add(new CustomBaseTypeProvider());
         }

diff --git a/src/embed_tests/CodecGroups.cs b/src/embed_tests/CodecGroups.cs
@@ -49,12 +49,12 @@ public void Encodes()
             };
 
             var uri = group.TryEncode(new Uri("data:"));
-            var clrObject = (CLRObject)ManagedType.GetManagedObject(uri.Handle);
+            var clrObject = (CLRObject)ManagedType.GetManagedObject(uri);
             Assert.AreSame(encoder1, clrObject.inst);
             Assert.AreNotSame(encoder2, clrObject.inst);
 
             var tuple = group.TryEncode(Tuple.Create(1));
-            clrObject = (CLRObject)ManagedType.GetManagedObject(tuple.Handle);
+            clrObject = (CLRObject)ManagedType.GetManagedObject(tuple);
             Assert.AreSame(encoder0, clrObject.inst);
         }
 

diff --git a/src/embed_tests/Inheritance.cs b/src/embed_tests/Inheritance.cs
@@ -13,8 +13,8 @@ public class Inheritance
         public void SetUp()
         {
             PythonEngine.Initialize();
-            var locals = new PyDict();
-            PythonEngine.Exec(InheritanceTestBaseClassWrapper.ClassSourceCode, locals: locals.Handle);
+            using var locals = new PyDict();
+            PythonEngine.Exec(InheritanceTestBaseClassWrapper.ClassSourceCode, locals: locals);
             ExtraBaseTypeProvider.ExtraBase = new PyType(locals[InheritanceTestBaseClassWrapper.ClassName]);
             var baseTypeProviders = PythonEngine.InteropConfiguration.PythonBaseTypeProviders;
             baseTypeProviders.Add(new ExtraBaseTypeProvider());
@@ -172,7 +172,7 @@ public int XProp
                     {
                         return scope.Eval<int>($"super(this.__class__, this).{nameof(XProp)}");
                     }
-                    catch (PythonException ex) when (ex.Type.Handle == Exceptions.AttributeError)
+                    catch (PythonException ex) when (PythonReferenceComparer.Instance.Equals(ex.Type, Exceptions.AttributeError))
                     {
                         if (this.extras.TryGetValue(nameof(this.XProp), out object value))
                             return (int)value;

diff --git a/src/embed_tests/References.cs b/src/embed_tests/References.cs
@@ -39,15 +39,9 @@ public void MoveToPyObject_SetsNull()
         public void CanBorrowFromNewReference()
         {
             var dict = new PyDict();
-            NewReference reference = Runtime.PyDict_Items(dict.Reference);
-            try
-            {
-                PythonException.ThrowIfIsNotZero(Runtime.PyList_Reverse(reference));
-            }
-            finally
-            {
-                reference.Dispose();
-            }
+            using NewReference reference = Runtime.PyDict_Items(dict.Reference);
+            BorrowedReference borrowed = reference.BorrowOrThrow();
+            PythonException.ThrowIfIsNotZero(Runtime.PyList_Reverse(borrowed));
         }
     }
 }
diff --git a/src/embed_tests/TestConverter.cs b/src/embed_tests/TestConverter.cs
@@ -42,7 +42,7 @@ public void TestConvertSingleToManaged(
             var pyFloat = new PyFloat(testValue);
 
             object convertedValue;
-            var converted = Converter.ToManaged(pyFloat.Handle, typeof(float), out convertedValue, false);
+            var converted = Converter.ToManaged(pyFloat, typeof(float), out convertedValue, false);
 
             Assert.IsTrue(converted);
             Assert.IsTrue(((float) convertedValue).Equals(testValue));
@@ -56,7 +56,7 @@ public void TestConvertDoubleToManaged(
             var pyFloat = new PyFloat(testValue);
 
             object convertedValue;
-            var converted = Converter.ToManaged(pyFloat.Handle, typeof(double), out convertedValue, false);
+            var converted = Converter.ToManaged(pyFloat, typeof(double), out convertedValue, false);
 
             Assert.IsTrue(converted);
             Assert.IsTrue(((double) convertedValue).Equals(testValue));
@@ -77,7 +77,7 @@ public void CovertTypeError()
                     object value;
                     try
                     {
-                        bool res = Converter.ToManaged(s.Handle, type, out value, true);
+                        bool res = Converter.ToManaged(s, type, out value, true);
                         Assert.IsFalse(res);
                         var bo = Exceptions.ExceptionMatches(Exceptions.TypeError);
                         Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.TypeError)
@@ -96,13 +96,13 @@ public void ConvertOverflow()
         {
             using (var num = new PyInt(ulong.MaxValue))
             {
-                IntPtr largeNum = PyRuntime.PyNumber_Add(num.Handle, num.Handle);
+                using var largeNum = PyRuntime.PyNumber_Add(num, num);
                 try
                 {
                     object value;
                     foreach (var type in _numTypes)
                     {
-                        bool res = Converter.ToManaged(largeNum, type, out value, true);
+                        bool res = Converter.ToManaged(largeNum.BorrowOrThrow(), type, out value, true);
                         Assert.IsFalse(res);
                         Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.OverflowError));
                         Exceptions.Clear();
@@ -111,7 +111,6 @@ public void ConvertOverflow()
                 finally
                 {
                     Exceptions.Clear();
-                    PyRuntime.XDecref(largeNum);
                 }
             }
         }
@@ -147,7 +146,7 @@ public void RawListProxy()
         {
             var list = new List<string> {"hello", "world"};
             var listProxy = PyObject.FromManagedObject(list);
-            var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy.Handle);
+            var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy);
             Assert.AreSame(list, clrObject.inst);
         }
 
@@ -156,7 +155,7 @@ public void RawPyObjectProxy()
         {
             var pyObject = "hello world!".ToPython();
             var pyObjectProxy = PyObject.FromManagedObject(pyObject);
-            var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy.Handle);
+            var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy);
             Assert.AreSame(pyObject, clrObject.inst);
 
             var proxiedHandle = pyObjectProxy.GetAttr("Handle").As<IntPtr>();

diff --git a/src/embed_tests/TestCustomMarshal.cs b/src/embed_tests/TestCustomMarshal.cs
@@ -23,11 +23,11 @@ public static void GetManagedStringTwice()
         {
             const string expected = "FooBar";
 
-            IntPtr op = Runtime.Runtime.PyString_FromString(expected);
-            string s1 = Runtime.Runtime.GetManagedString(op);
-            string s2 = Runtime.Runtime.GetManagedString(op);
+            using var op = Runtime.Runtime.PyString_FromString(expected);
+            string s1 = Runtime.Runtime.GetManagedString(op.BorrowOrThrow());
+            string s2 = Runtime.Runtime.GetManagedString(op.Borrow());
 
-            Assert.AreEqual(1, Runtime.Runtime.Refcount(op));
+            Assert.AreEqual(1, Runtime.Runtime.Refcount32(op.Borrow()));
             Assert.AreEqual(expected, s1);
             Assert.AreEqual(expected, s2);
         }

diff --git a/src/embed_tests/TestDomainReload.cs b/src/embed_tests/TestDomainReload.cs
@@ -107,7 +107,7 @@ from Python.EmbeddingTest.Domain import MyClass
                         {
                             Debug.Assert(obj.AsManagedObject(type).GetType() == type);
                             // We only needs its Python handle
-                            PyRuntime.XIncref(obj.Handle);
+                            PyRuntime.XIncref(obj);
                             return obj.Handle;
                         }
                     }
@@ -127,16 +127,16 @@ public override ValueType Execute(ValueType arg)
             {
                 // handle refering a clr object created in previous domain,
                 // it should had been deserialized and became callable agian.
-                IntPtr handle = (IntPtr)arg;
+                using var handle = NewReference.DangerousFromPointer((IntPtr)arg);
                 try
                 {
                     using (Py.GIL())
                     {
-                        IntPtr tp = Runtime.Runtime.PyObject_TYPE(handle);
-                        IntPtr tp_clear = Marshal.ReadIntPtr(tp, TypeOffset.tp_clear);
+                        BorrowedReference tp = Runtime.Runtime.PyObject_TYPE(handle.Borrow());
+                        IntPtr tp_clear = Util.ReadIntPtr(tp, TypeOffset.tp_clear);
                         Assert.That(tp_clear, Is.Not.Null);
 
-                        using (PyObject obj = new PyObject(handle))
+                        using (PyObject obj = new PyObject(handle.Steal()))
                         {
                             obj.InvokeMethod("Method");
                             obj.InvokeMethod("StaticMethod");

diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -212,7 +212,7 @@ public void ValidateRefCount()
                 Assert.AreEqual(ptr, e.Handle);
                 Assert.AreEqual(2, e.ImpactedObjects.Count);
                 // Fix for this test, don't do this on general environment
-                Runtime.Runtime.XIncref(e.Handle);
+                Runtime.Runtime.XIncref(e.Reference);
                 return false;
             };
             Finalizer.Instance.IncorrectRefCntResolver += handler;

diff --git a/src/embed_tests/TestNamedArguments.cs b/src/embed_tests/TestNamedArguments.cs
@@ -55,7 +55,7 @@ def Test3(self, a1 = 1, a2 = 1, a3 = 1, a4 = 1):
         return a1 + a2 + a3 + a4
 
 a = cmTest3()
-", null, locals.Handle);
+", null, locals);
 
             return locals.GetItem("a");
         }

diff --git a/src/embed_tests/TestPyInt.cs b/src/embed_tests/TestPyInt.cs
@@ -86,7 +86,6 @@ public void TestCtorSByte()
         public void TestCtorPyObject()
         {
             var i = new PyInt(5);
-            Runtime.Runtime.XIncref(i.Handle);
             var a = new PyInt(i);
             Assert.AreEqual(5, a.ToInt32());
         }

diff --git a/src/embed_tests/TestPyObject.cs b/src/embed_tests/TestPyObject.cs
@@ -46,7 +46,7 @@ def add(self, x, y):
         return x + y
 
 a = MemberNamesTest()
-", null, locals.Handle);
+", null, locals);
 
             PyObject a = locals.GetItem("a");
 
@@ -92,13 +92,13 @@ public void GetAttrDefault_IgnoresAttributeErrorOnly()
             var typeErrResult = Assert.Throws<PythonException>(
                 () => ob.GetAttr(nameof(PyObjectTestMethods.RaisesTypeError), fallback)
             );
-            Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type.Handle);
+            Assert.AreEqual(Exceptions.TypeError, typeErrResult.Type);
         }
     }
 
     public class PyObjectTestMethods
     {
-        public string RaisesAttributeError => throw new PythonException(new PyType(new BorrowedReference(Exceptions.AttributeError)), value: null, traceback: null);
-        public string RaisesTypeError => throw new PythonException(new PyType(new BorrowedReference(Exceptions.TypeError)), value: null, traceback: null);
+        public string RaisesAttributeError => throw new PythonException(new PyType(Exceptions.AttributeError), value: null, traceback: null);
+        public string RaisesTypeError => throw new PythonException(new PyType(Exceptions.TypeError), value: null, traceback: null);
     }
 }
diff --git a/src/embed_tests/TestPySequence.cs b/src/embed_tests/TestPySequence.cs
@@ -87,9 +87,9 @@ public void TestIndex()
         {
             var t1 = new PyString("FooBar");
 
-            Assert.AreEqual(4, t1.Index(new PyString("a")));
-            Assert.AreEqual(5, t1.Index(new PyString("r")));
-            Assert.AreEqual(-1, t1.Index(new PyString("z")));
+            Assert.AreEqual(4, t1.Index32(new PyString("a")));
+            Assert.AreEqual(5L, t1.Index64(new PyString("r")));
+            Assert.AreEqual(-(nint)1, t1.Index(new PyString("z")));
         }
     }
 }