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

serhiy-storchaka · serhiy-storchaka · commit 4b23494ded6c · 2016-05-16T22:24:03.000+03:00
Based on patch by Joe Jevnik.
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -1177,6 +1177,13 @@ def test_remove(self):
         b.remove(Indexable(ord('e')))
         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):
         b = bytearray(b'world')
         self.assertEqual(b.pop(), ord('d'))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: tba
 Core and Builtins
 -----------------
 
+- Issue #27039: Fixed bytearray.remove() for values greater than 127.  Based on
+  patch by Joe Jevnik.
+
 - Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
 
 - Issue #27005: Optimized the float.fromhex() class method for exact float.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -1734,11 +1734,8 @@ bytearray_remove_impl(PyByteArrayObject *self, int value)
     Py_ssize_t where, n = Py_SIZE(self);
     char *buf = PyByteArray_AS_STRING(self);
 
-    for (where = 0; where < n; where++) {
-        if (buf[where] == value)
-            break;
-    }
-    if (where == n) {
+    where = stringlib_find_char(buf, n, value);
+    if (where < 0) {
         PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
         return NULL;
     }
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
