PyBuffer fixes 3

thesn10 · thesn10 · commit 0ee1f2f36fa1 · 2019-11-06T23:13:50.000+01:00
diff --git a/src/embed_tests/TestPyBuffer.cs b/src/embed_tests/TestPyBuffer.cs
@@ -24,19 +24,22 @@ public void TestBufferWrite()
 
             string bufferTestString = "hello world! !$%&/()=?";
 
-            using (var scope = Py.CreateScope())
+            using (Py.GIL())
             {
-                scope.Exec($"arr = bytearray({bufferTestString.Length})");
-                PyObject pythonArray = scope.Get("arr");
-                byte[] managedArray = new UTF8Encoding().GetBytes(bufferTestString);
-
-                using (PyBuffer buf = pythonArray.GetBuffer())
+                using (var scope = Py.CreateScope())
                 {
-                    buf.Write(managedArray, 0, managedArray.Length);
-                }
+                    scope.Exec($"arr = bytearray({bufferTestString.Length})");
+                    PyObject pythonArray = scope.Get("arr");
+                    byte[] managedArray = new UTF8Encoding().GetBytes(bufferTestString);
 
-                string result = scope.Eval("arr.decode('utf-8')").ToString();
-                Assert.IsTrue(result == bufferTestString);
+                    using (PyBuffer buf = pythonArray.GetBuffer())
+                    {
+                        buf.Write(managedArray, 0, managedArray.Length);
+                    }
+
+                    string result = scope.Eval("arr.decode('utf-8')").ToString();
+                    Assert.IsTrue(result == bufferTestString);
+                }
             }
         }
 
@@ -47,19 +50,22 @@ public void TestBufferRead()
 
             string bufferTestString = "hello world! !$%&/()=?";
 
-            using (var scope = Py.CreateScope())
+            using (Py.GIL())
             {
-                scope.Exec($"arr = b'{bufferTestString}'");
-                PyObject pythonArray = scope.Get("arr");
-                byte[] managedArray = new byte[bufferTestString.Length];
-
-                using (PyBuffer buf = pythonArray.GetBuffer())
+                using (var scope = Py.CreateScope())
                 {
-                    buf.Read(managedArray, 0, managedArray.Length);
-                }
+                    scope.Exec($"arr = b'{bufferTestString}'");
+                    PyObject pythonArray = scope.Get("arr");
+                    byte[] managedArray = new byte[bufferTestString.Length];
 
-                string result = new UTF8Encoding().GetString(managedArray);
-                Assert.IsTrue(result == bufferTestString);
+                    using (PyBuffer buf = pythonArray.GetBuffer())
+                    {
+                        buf.Read(managedArray, 0, managedArray.Length);
+                    }
+
+                    string result = new UTF8Encoding().GetString(managedArray);
+                    Assert.IsTrue(result == bufferTestString);
+                }
             }
         }
     }
diff --git a/src/runtime/pybuffer.cs b/src/runtime/pybuffer.cs
@@ -226,10 +226,10 @@ private void Dispose(bool disposing)
             }
         }
 
-        //~PyBuffer()
-        //{
-        //    Dispose(false);
-        //}
+        ~PyBuffer()
+        {
+            Dispose(false);
+        }
 
         /// <summary>
         /// Release the buffer view and decrement the reference count for view->obj. This function MUST be called when the buffer is no longer being used, otherwise reference leaks may occur.
@@ -238,7 +238,7 @@ private void Dispose(bool disposing)
         public void Dispose()
         {
             Dispose(true);
-            //GC.SuppressFinalize(this);
+            GC.SuppressFinalize(this);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -226,10 +226,10 @@ private void Dispose(bool disposing)`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`- //~PyBuffer()`
`230`		`- //{`
`231`		`- // Dispose(false);`
`232`		`- //}`
	`229`	`+ ~PyBuffer()`
	`230`	`+ {`
	`231`	`+ Dispose(false);`
	`232`	`+ }`
`233`	`233`
`234`	`234`	`/// <summary>`
`235`	`235`	`/// Release the buffer view and decrement the reference count for view->obj. This function MUST be called when the buffer is no longer being used, otherwise reference leaks may occur.`
`@@ -238,7 +238,7 @@ private void Dispose(bool disposing)`
`238`	`238`	`public void Dispose()`
`239`	`239`	`{`
`240`	`240`	`Dispose(true);`
`241`		`- //GC.SuppressFinalize(this);`
	`241`	`+ GC.SuppressFinalize(this);`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`	`}`