diff options
| -rw-r--r-- | Lib/test/test_bytes.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/bytearrayobject.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index ee4804f..615c955 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -690,6 +690,8 @@ class ByteArrayTest(BaseBytesTest): self.assertEqual(b.pop(-2), ord('r')) self.assertRaises(IndexError, lambda: b.pop(10)) self.assertRaises(OverflowError, lambda: bytearray().pop()) + # test for issue #6846 + self.assertEqual(bytearray(b'\xff').pop(), 0xff) def test_nosort(self): self.assertRaises(AttributeError, lambda: bytearray().sort()) @@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1 Core and Builtins ----------------- +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + - classmethod no longer checks if its argument is callable. - Issue #6750: A text file opened with io.open() could duplicate its output diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 27b41bb..4105fa2 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2773,7 +2773,7 @@ bytearray_pop(PyByteArrayObject *self, PyObject *args) if (PyByteArray_Resize((PyObject *)self, n - 1) < 0) return NULL; - return PyInt_FromLong(value); + return PyInt_FromLong((unsigned char)value); } PyDoc_STRVAR(remove__doc__, |