Merge branch 'master' into pybuffer2

pythonnet · thesn10 · Oct 27, 2019 · May 23, 2020 · May 29, 2020 · Oct 30, 2020
commit abf957f1c94d8ece5d28aa94eb5d877236034d2e
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ## [Unreleased][]
 
 ### Added
+-   Added Python 3 buffer api support and PyBuffer interface for fast byte and numpy array read/write ([#980][p980])
 
 ### Changed
 -   Drop support for Python 2, 3.4, and 3.5
@@ -49,7 +50,8 @@ This version improves performance on benchmarks significantly compared to 2.3.
 -   `Runtime.None` to be able to pass `None` as parameter into Python from .NET
 -   `PyObject.IsNone()` to check if a Python object is None in .NET.
 -   Support for Python 3.8
--   Added Python 3 buffer api support and PyBuffer interface for fast byte and numpy array read/write ([#980][p980])
+-   Codecs as the designated way to handle automatic conversions between
+    .NET and Python types
 
 ### Changed
 

diff --git a/src/embed_tests/TestPyBuffer.cs b/src/embed_tests/TestPyBuffer.cs
@@ -20,8 +20,6 @@ public void Dispose()
         [Test]
         public void TestBufferWrite()
         {
-            if (Runtime.Runtime.pyversionnumber < 35) return;
-
             string bufferTestString = "hello world! !$%&/()=?";
 
             using (Py.GIL())
@@ -46,8 +44,6 @@ public void TestBufferWrite()
         [Test]
         public void TestBufferRead()
         {
-            if (Runtime.Runtime.pyversionnumber < 35) return;
-
             string bufferTestString = "hello world! !$%&/()=?";
 
             using (Py.GIL())

diff --git a/src/runtime/pybuffer.cs b/src/runtime/pybuffer.cs
@@ -88,7 +88,7 @@ private static char OrderStyleToChar(BufferOrderStyle order, bool eitherOneValid
         /// </summary>
         public static long SizeFromFormat(string format)
         {
-            if (Runtime.pyversionnumber < 39)
+            if (Runtime.PyVersion < new Version(3,9))
                 throw new NotSupportedException("SizeFromFormat requires at least Python 3.9");
             return (long)Runtime.PyBuffer_SizeFromFormat(format);
         }
@@ -111,7 +111,7 @@ public IntPtr GetPointer(long[] indices)
         {
             if (disposedValue)
                 throw new ObjectDisposedException(nameof(PyBuffer));
-            if (Runtime.pyversionnumber < 37)
+            if (Runtime.PyVersion < new Version(3, 7))
                 throw new NotSupportedException("GetPointer requires at least Python 3.7");
             return Runtime.PyBuffer_GetPointer(ref _view, indices.Select(x => (IntPtr)x).ToArray());
         }
@@ -123,7 +123,7 @@ public void FromContiguous(IntPtr buf, long len, BufferOrderStyle fort)
         {
             if (disposedValue)
                 throw new ObjectDisposedException(nameof(PyBuffer));
-            if (Runtime.pyversionnumber < 37)
+            if (Runtime.PyVersion < new Version(3, 7))
                 throw new NotSupportedException("FromContiguous requires at least Python 3.7");
 
             if (Runtime.PyBuffer_FromContiguous(ref _view, buf, (IntPtr)len, OrderStyleToChar(fort, false)) < 0)
@@ -139,8 +139,6 @@ public void ToContiguous(IntPtr buf, BufferOrderStyle order)
         {
             if (disposedValue)
                 throw new ObjectDisposedException(nameof(PyBuffer));
-            if (Runtime.pyversionnumber < 36)
-                throw new NotSupportedException("ToContiguous requires at least Python 3.6");
 
             if (Runtime.PyBuffer_ToContiguous(buf, ref _view, _view.len, OrderStyleToChar(order, true)) < 0)
                 throw new PythonException();

diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -1092,7 +1092,6 @@ public override int GetHashCode()
         /// </remarks>
         public PyBuffer GetBuffer(PyBUF flags = PyBUF.SIMPLE)
         {
-            if (Runtime.pyversionnumber < 35) throw new NotSupportedException("GetBuffer requires at least Python 3.5");
             return new PyBuffer(this, flags);
         }
 

diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1146,10 +1146,14 @@ internal static long PyObject_Size(IntPtr pointer)
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyObject_Dir(IntPtr pointer);
 
+#if PYTHON_WITH_PYDEBUG
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void _Py_NewReference(IntPtr ob);
+#endif
+
         //====================================================================
         // Python buffer API
         //====================================================================
-
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int PyObject_CheckBuffer(IntPtr obj);