Only get PyBUF_SIMPLE buffers

This is the same as in zlibmodule.c

Author: rhpvorderman

src/isal/isal_zlib.pyx

@@ -31,8 +31,7 @@ from .crc cimport crc32_gzip_refl
 from .igzip_lib cimport *
 from libc.stdint cimport UINT64_MAX, UINT32_MAX
 from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free
-from cpython.buffer cimport PyBUF_READ, PyBUF_C_CONTIGUOUS, PyObject_GetBuffer, \
-    PyBuffer_Release
+from cpython.buffer cimport PyBUF_SIMPLE, PyObject_GetBuffer, PyBuffer_Release
 from cpython.bytes cimport PyBytes_FromStringAndSize
 from cpython.long cimport PyLong_AsUnsignedLongMask
 
@@ -97,7 +96,7 @@ def adler32(data, value = 1):
     cdef unsigned long init = PyLong_AsUnsignedLongMask(value)
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
-    if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+    if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
         raise TypeError("Failed to get buffer")
     try:
         if buffer.len > UINT64_MAX:
@@ -117,7 +116,7 @@ def crc32(data, value = 0):
     cdef unsigned long init = PyLong_AsUnsignedLongMask(value)
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
-    if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+    if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
         raise TypeError("Failed to get buffer")
     try:
         if buffer.len > UINT64_MAX:
@@ -218,7 +217,7 @@ def compress(data,
     # initialise input
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
-    if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+    if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
         raise TypeError("Failed to get buffer")
     cdef Py_ssize_t ibuflen = buffer.len
     cdef unsigned char * ibuf = <unsigned char*>buffer.buf
@@ -295,7 +294,7 @@ def decompress(data,
     # initialise input
     cdef Py_buffer buffer_data
     cdef Py_buffer* buffer = &buffer_data
-    if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+    if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
         raise TypeError("Failed to get buffer")
     cdef Py_ssize_t ibuflen = buffer.len
     cdef unsigned char * ibuf = <unsigned char*>buffer.buf
@@ -439,7 +438,7 @@ cdef class Compress:
         # initialise input
         cdef Py_buffer buffer_data
         cdef Py_buffer* buffer = &buffer_data
-        if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+        if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
             raise TypeError("Failed to get buffer")
         cdef Py_ssize_t ibuflen = buffer.len
         cdef unsigned char * ibuf = <unsigned char*>buffer.buf
@@ -618,7 +617,7 @@ cdef class Decompress:
         # initialise input
         cdef Py_buffer buffer_data
         cdef Py_buffer* buffer = &buffer_data
-        if PyObject_GetBuffer(data, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+        if PyObject_GetBuffer(data, buffer, PyBUF_SIMPLE) != 0:
             raise TypeError("Failed to get buffer")
         cdef Py_ssize_t ibuflen = buffer.len
         cdef unsigned char * ibuf = <unsigned char*>buffer.buf
@@ -674,7 +673,7 @@ cdef class Decompress:
 
         cdef Py_buffer buffer_data
         cdef Py_buffer* buffer = &buffer_data
-        if PyObject_GetBuffer(self.unconsumed_tail, buffer, PyBUF_READ & PyBUF_C_CONTIGUOUS) != 0:
+        if PyObject_GetBuffer(self.unconsumed_tail, buffer, PyBUF_SIMPLE) != 0:
             raise TypeError("Failed to get buffer")
         cdef Py_ssize_t ibuflen = buffer.len
         cdef unsigned char * ibuf = <unsigned char*>buffer.buf