Fixes for the merge

BadSingleton · BadSingleton · commit 8c133e3c19dd · 2020-09-02T14:13:42.000-04:00
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -25,7 +25,7 @@ public static void LoadDefaultArgs()
         {
             using (new PythonEngine())
             {
-                using(var argv = new PyList(new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"))))
+                using(var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
                 {
                     Assert.AreNotEqual(0, argv.Length());
                 }
@@ -38,7 +38,7 @@ public static void LoadSpecificArgs()
             var args = new[] { "test1", "test2" };
             using (new PythonEngine(args))
             {
-                using(var argv = new PyList(new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"))))
+                using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
                 {
                     Assert.AreEqual(args[0], argv[0].ToString());
                     Assert.AreEqual(args[1], argv[1].ToString());
diff --git a/src/runtime/pylist.cs b/src/runtime/pylist.cs
@@ -85,26 +85,6 @@ public PyList(PyObject[] items)
             }
         }
 
-        /// <summary>
-        /// Constructor to make a PyList from a BorrowedReference.
-        /// The list assumes ownership of the reference.
-        /// </summary>
-        /// <param name="r">The borrowed reference</param>
-        internal PyList(BorrowedReference r)
-        {
-            IntPtr addr = r.DangerousGetAddress();
-            if(!Runtime.PyList_Check(addr))
-            {
-                throw new ArgumentException("object is not a list");
-            }
-            
-            obj = addr;
-            // Take ownership.
-            Runtime.XIncref(addr);
-
-        }
-
-
         /// <summary>
         /// IsListType Method
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static void LoadDefaultArgs()`
`25`	`25`	`{`
`26`	`26`	`using (new PythonEngine())`
`27`	`27`	`{`
`28`		`- using(var argv = new PyList(new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"))))`
	`28`	`+ using(var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`29`	`29`	`{`
`30`	`30`	`Assert.AreNotEqual(0, argv.Length());`
`31`	`31`	`}`
`@@ -38,7 +38,7 @@ public static void LoadSpecificArgs()`
`38`	`38`	`var args = new[] { "test1", "test2" };`
`39`	`39`	`using (new PythonEngine(args))`
`40`	`40`	`{`
`41`		`- using(var argv = new PyList(new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"))))`
	`41`	`+ using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`42`	`42`	`{`
`43`	`43`	`Assert.AreEqual(args[0], argv[0].ToString());`
`44`	`44`	`Assert.AreEqual(args[1], argv[1].ToString());`