From: Mark Dickinson Date: Sun, 6 Sep 2009 10:20:23 +0000 (+0000) Subject: Merged revisions 74675 via svnmerge from X-Git-Tag: v3.1.2rc1~560 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=424d75a3f57bfd465dd7c7342f79a8afeaafafcb;p=python Merged revisions 74675 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74675 | mark.dickinson | 2009-09-06 11:19:23 +0100 (Sun, 06 Sep 2009) | 10 lines Merged revisions 74673 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74673 | mark.dickinson | 2009-09-06 11:03:31 +0100 (Sun, 06 Sep 2009) | 3 lines Issue #6846: bytearray.pop was returning ints in the range [-128, 128) instead of [0, 256). Thanks Hagen Fürstenau for the report and fix. ........ ................ --- diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index caea9094b1..dd01b936b2 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -716,6 +716,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()) diff --git a/Misc/NEWS b/Misc/NEWS index 9b189f5347..45201cc58a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 3.1.1? Core and Builtins ----------------- +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + - Issue #6750: A text file opened with io.open() could duplicate its output when writing from multiple threads at the same time. diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index f3d569712f..f8f9469f5f 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2705,7 +2705,7 @@ bytearray_pop(PyByteArrayObject *self, PyObject *args) if (PyByteArray_Resize((PyObject *)self, n - 1) < 0) return NULL; - return PyLong_FromLong(value); + return PyLong_FromLong((unsigned char)value); } PyDoc_STRVAR(remove__doc__,