new_buffer_error

Author: youknowone

vm/src/function/buffer.rs

@@ -19,10 +19,9 @@ impl PyObject {
         f: impl FnOnce(&[u8]) -> R,
     ) -> PyResult<R> {
         let buffer = PyBuffer::try_from_borrowed_object(vm, self)?;
-        buffer
-            .as_contiguous()
-            .map(|x| f(&x))
-            .ok_or_else(|| vm.new_type_error("non-contiguous buffer is not a bytes-like object"))
+        buffer.as_contiguous().map(|x| f(&x)).ok_or_else(|| {
+            vm.new_buffer_error("non-contiguous buffer is not a bytes-like object".to_owned())
+        })
     }
 
     pub fn try_rw_bytes_like<R>(
@@ -81,7 +80,7 @@ impl<'a> TryFromBorrowedObject<'a> for ArgBytesLike {
         if buffer.desc.is_contiguous() {
             Ok(Self(buffer))
         } else {
-            Err(vm.new_type_error("non-contiguous buffer is not a bytes-like object"))
+            Err(vm.new_buffer_error("non-contiguous buffer is not a bytes-like object".to_owned()))
         }
     }
 }
@@ -121,9 +120,9 @@ impl<'a> TryFromBorrowedObject<'a> for ArgMemoryBuffer {
     fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> {
         let buffer = PyBuffer::try_from_borrowed_object(vm, obj)?;
         if !buffer.desc.is_contiguous() {
-            Err(vm.new_type_error("non-contiguous buffer is not a bytes-like object"))
+            Err(vm.new_buffer_error("non-contiguous buffer is not a bytes-like object".to_owned()))
         } else if buffer.desc.readonly {
-            Err(vm.new_type_error("buffer is not a read-write bytes-like object"))
+            Err(vm.new_buffer_error("buffer is not a read-write bytes-like object".to_owned()))
         } else {
             Ok(Self(buffer))
         }