@@ -12,8 +12,8 @@ from cpython.buffer cimport PyBUF_ANY_CONTIGUOUS, PyBUF_WRITEABLE
1212from cpython.bytes cimport PyBytes_FromStringAndSize, PyBytes_AS_STRING
1313
1414
15- from numcodecs.compat_ext cimport MyBuffer
16- from numcodecs.compat_ext import MyBuffer
15+ from numcodecs.compat_ext cimport Buffer
16+ from numcodecs.compat_ext import Buffer
1717from numcodecs.compat import PY2, text_type
1818from numcodecs.abc import Codec
1919
@@ -109,11 +109,11 @@ def cbuffer_sizes(source):
109109
110110 """
111111 cdef:
112- MyBuffer buffer
112+ Buffer buffer
113113 size_t nbytes, cbytes, blocksize
114114
115115 # obtain buffer
116- buffer = MyBuffer (source, PyBUF_ANY_CONTIGUOUS)
116+ buffer = Buffer (source, PyBUF_ANY_CONTIGUOUS)
117117
118118 # determine buffer size
119119 blosc_cbuffer_sizes(buffer .ptr, & nbytes, & cbytes, & blocksize)
@@ -151,12 +151,12 @@ def compress(source, char* cname, int clevel, int shuffle, int blocksize=0):
151151 cdef:
152152 char * source_ptr
153153 char * dest_ptr
154- MyBuffer source_buffer
154+ Buffer source_buffer
155155 size_t nbytes, cbytes, itemsize
156156 bytes dest
157157
158158 # setup source buffer
159- source_buffer = MyBuffer (source, PyBUF_ANY_CONTIGUOUS)
159+ source_buffer = Buffer (source, PyBUF_ANY_CONTIGUOUS)
160160 source_ptr = source_buffer.ptr
161161 nbytes = source_buffer.nbytes
162162 itemsize = source_buffer.itemsize
@@ -227,12 +227,12 @@ def decompress(source, dest=None):
227227 int ret
228228 char * source_ptr
229229 char * dest_ptr
230- MyBuffer source_buffer
231- MyBuffer dest_buffer = None
230+ Buffer source_buffer
231+ Buffer dest_buffer = None
232232 size_t nbytes, cbytes, blocksize
233233
234234 # setup source buffer
235- source_buffer = MyBuffer (source, PyBUF_ANY_CONTIGUOUS)
235+ source_buffer = Buffer (source, PyBUF_ANY_CONTIGUOUS)
236236 source_ptr = source_buffer.ptr
237237
238238 # determine buffer size
@@ -245,7 +245,7 @@ def decompress(source, dest=None):
245245 dest_ptr = PyBytes_AS_STRING(dest)
246246 dest_nbytes = nbytes
247247 else :
248- dest_buffer = MyBuffer (dest, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
248+ dest_buffer = Buffer (dest, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
249249 dest_ptr = dest_buffer.ptr
250250 dest_nbytes = dest_buffer.nbytes
251251
0 commit comments