Commitc9ba956

authored

new_buffer_error (#6243)

1 parent9792001 commitc9ba956Copy full SHA for c9ba956

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,6 @@ def test_base64_roundtrip(self, binary, newline):`
`490`	`490`	`restored=binascii.a2b_base64(self.type2test(converted))`
`491`	`491`	`self.assertConversion(binary,converted,restored,newline=newline)`
`492`	`492`
`493`		`-@unittest.expectedFailure# TODO: RUSTPYTHON`
`494`	`493`	`deftest_c_contiguity(self):`
`495`	`494`	`m=memoryview(bytearray(b'noncontig'))`
`496`	`495`	`noncontig_writable=m[::-2]`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1811,7 +1811,6 @@ def test_pending(self):`
`1811`	`1811`	`bio.read()`
`1812`	`1812`	`self.assertEqual(bio.pending,0)`
`1813`	`1813`
`1814`		`-@unittest.expectedFailure# TODO: RUSTPYTHON`
`1815`	`1814`	`deftest_buffer_types(self):`
`1816`	`1815`	`bio=ssl.MemoryBIO()`
`1817`	`1816`	`bio.write(b'foo')`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ impl PyObject {`
`22`	`22`	`buffer`
`23`	`23`	`.as_contiguous()`
`24`	`24`	`.map(\|x\|f(&x))`
`25`		`-.ok_or_else(\|\| vm.new_type_error("non-contiguous buffer is not a bytes-like object"))`
	`25`	`+.ok_or_else(\|\| vm.new_buffer_error("non-contiguous buffer is not a bytes-like object"))`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pubfntry_rw_bytes_like<R>(`
`@@ -81,7 +81,7 @@ impl<'a> TryFromBorrowedObject<'a> for ArgBytesLike {`
`81`	`81`	`if buffer.desc.is_contiguous(){`
`82`	`82`	`Ok(Self(buffer))`
`83`	`83`	`}else{`
`84`		`-Err(vm.new_type_error("non-contiguous buffer is not a bytes-like object"))`
	`84`	`+Err(vm.new_buffer_error("non-contiguous buffer is not a bytes-like object"))`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
`@@ -121,7 +121,7 @@ impl<'a> TryFromBorrowedObject<'a> for ArgMemoryBuffer {`
`121`	`121`	`fntry_from_borrowed_object(vm:&VirtualMachine,obj:&'aPyObject) ->PyResult<Self>{`
`122`	`122`	`let buffer =PyBuffer::try_from_borrowed_object(vm, obj)?;`
`123`	`123`	`if !buffer.desc.is_contiguous(){`
`124`		`-Err(vm.new_type_error("non-contiguous buffer is not a bytes-like object"))`
	`124`	`+Err(vm.new_buffer_error("non-contiguous buffer is not a bytes-like object"))`
`125`	`125`	`}elseif buffer.desc.readonly{`
`126`	`126`	`Err(vm.new_type_error("buffer is not a read-write bytes-like object"))`
`127`	`127`	`}else{`

Comments

(0)