BorrowReference instead of increasing the refcount

BadSingleton · BadSingleton · commit 802a43abc47c · 2020-08-20T14:16:12.000-04:00
Addresses comments: #958 #958
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -24,10 +24,12 @@ public static void StartAndStopTwice()
         public static void LoadDefaultArgs()
         {
             using (new PythonEngine())
-            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                Runtime.Runtime.XIncref(argv.Handle);
-                Assert.AreNotEqual(0, argv.Length());
+                var argvref = new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"));
+                using(var argv = new PyList(argvref.DangerousGetAddress()))
+                {
+                    Assert.AreNotEqual(0, argv.Length());
+                }
             }
         }
 
@@ -36,11 +38,13 @@ public static void LoadSpecificArgs()
         {
             var args = new[] { "test1", "test2" };
             using (new PythonEngine(args))
-            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                Runtime.Runtime.XIncref(argv.Handle);
-                Assert.AreEqual(args[0], argv[0].ToString());
-                Assert.AreEqual(args[1], argv[1].ToString());
+                var argvref = new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"));
+                using(var argv = new PyList(argvref.DangerousGetAddress()))
+                {
+                    Assert.AreEqual(args[0], argv[0].ToString());
+                    Assert.AreEqual(args[1], argv[1].ToString());
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,12 @@ public static void StartAndStopTwice()`
`24`	`24`	`public static void LoadDefaultArgs()`
`25`	`25`	`{`
`26`	`26`	`using (new PythonEngine())`
`27`		`- using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`28`	`27`	`{`
`29`		`- Runtime.Runtime.XIncref(argv.Handle);`
`30`		`- Assert.AreNotEqual(0, argv.Length());`
	`28`	`+ var argvref = new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"));`
	`29`	`+ using(var argv = new PyList(argvref.DangerousGetAddress()))`
	`30`	`+ {`
	`31`	`+ Assert.AreNotEqual(0, argv.Length());`
	`32`	`+ }`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
`@@ -36,11 +38,13 @@ public static void LoadSpecificArgs()`
`36`	`38`	`{`
`37`	`39`	`var args = new[] { "test1", "test2" };`
`38`	`40`	`using (new PythonEngine(args))`
`39`		`- using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`40`	`41`	`{`
`41`		`- Runtime.Runtime.XIncref(argv.Handle);`
`42`		`- Assert.AreEqual(args[0], argv[0].ToString());`
`43`		`- Assert.AreEqual(args[1], argv[1].ToString());`
	`42`	`+ var argvref = new BorrowedReference(Runtime.Runtime.PySys_GetObject("argv"));`
	`43`	`+ using(var argv = new PyList(argvref.DangerousGetAddress()))`
	`44`	`+ {`
	`45`	`+ Assert.AreEqual(args[0], argv[0].ToString());`
	`46`	`+ Assert.AreEqual(args[1], argv[1].ToString());`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`