mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-37417: Fix error handling in bytearray.extend. (GH-14407)

Browse source
This commit is contained in:
Brandt Bucher 2019-06-26 12:06:18 -07:00 • committed by Serhiy Storchaka
parent 5150d32792
commit 2a7d596f27
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_builtin.py
View file

@ -1592,6 +1592,11 @@ class BuiltinTest(unittest.TestCase):
self.assertRaises(ValueError, x.translate, b"1", 1) self.assertRaises(ValueError, x.translate, b"1", 1)
self.assertRaises(TypeError, x.translate, b"1"*256, 1) self.assertRaises(TypeError, x.translate, b"1"*256, 1)
def test_bytearray_extend_error(self):
array = bytearray()
bad_iter = map(int, "X")
self.assertRaises(ValueError, array.extend, bad_iter)
def test_construct_singletons(self): def test_construct_singletons(self):
for const in None, Ellipsis, NotImplemented: for const in None, Ellipsis, NotImplemented:
tp = type(const) tp = type(const)

2
Misc/NEWS.d/next/Core and Builtins/2019-06-26-18-41-00.bpo-37417.VsZeHL.rst Normal file
View file

@ -0,0 +1,2 @@
:meth:`bytearray.extend` now correctly handles errors that arise during iteration.
Patch by Brandt Bucher.

4
Objects/bytearrayobject.c
View file

@ -1698,6 +1698,10 @@ bytearray_extend(PyByteArrayObject *self, PyObject *iterable_of_ints)
} }
Py_DECREF(bytearray_obj); Py_DECREF(bytearray_obj);
if (PyErr_Occurred()) {
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }