Commit c34a42a4 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #27039: Fixed bytearray.remove() for values greater than 127.

Patch by Joe Jevnik.
parent 55f951e6
...@@ -1082,6 +1082,13 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase): ...@@ -1082,6 +1082,13 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
b.remove(Indexable(ord('e'))) b.remove(Indexable(ord('e')))
self.assertEqual(b, b'') self.assertEqual(b, b'')
# test values outside of the ascii range: (0, 127)
c = bytearray([126, 127, 128, 129])
c.remove(127)
self.assertEqual(c, bytes([126, 128, 129]))
c.remove(129)
self.assertEqual(c, bytes([126, 128]))
def test_pop(self): def test_pop(self):
b = bytearray(b'world') b = bytearray(b'world')
self.assertEqual(b.pop(), ord('d')) self.assertEqual(b.pop(), ord('d'))
......
...@@ -10,6 +10,9 @@ Release date: tba ...@@ -10,6 +10,9 @@ Release date: tba
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #27039: Fixed bytearray.remove() for values greater than 127. Patch by
Joe Jevnik.
- Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses. - Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
- Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL - Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL
......
...@@ -2565,21 +2565,18 @@ static PyObject * ...@@ -2565,21 +2565,18 @@ static PyObject *
bytearray_remove_impl(PyByteArrayObject *self, int value) bytearray_remove_impl(PyByteArrayObject *self, int value)
/*[clinic end generated code: output=d659e37866709c13 input=47560b11fd856c24]*/ /*[clinic end generated code: output=d659e37866709c13 input=47560b11fd856c24]*/
{ {
Py_ssize_t where, n = Py_SIZE(self); Py_ssize_t n = Py_SIZE(self);
char *buf = PyByteArray_AS_STRING(self); char *buf = PyByteArray_AS_STRING(self);
char *where = memchr(buf, value, n);
for (where = 0; where < n; where++) { if (!where) {
if (buf[where] == value)
break;
}
if (where == n) {
PyErr_SetString(PyExc_ValueError, "value not found in bytearray"); PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
return NULL; return NULL;
} }
if (!_canresize(self)) if (!_canresize(self))
return NULL; return NULL;
memmove(buf + where, buf + where + 1, n - where); memmove(where, where + 1, buf + n - where);
if (PyByteArray_Resize((PyObject *)self, n - 1) < 0) if (PyByteArray_Resize((PyObject *)self, n - 1) < 0)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment