diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-09-06 10:05:28 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-09-06 10:05:28 (GMT) |
| commit | b61c035dc2c625a99858efc353294cee0c179184 (patch) | |
| tree | 735adf492a55091e7132c13a38fdae5e645a1a9a | |
| parent | 545e7203d4fe69dedde58487492b2b5db587ed25 (diff) | |
| download | cpython-b61c035dc2c625a99858efc353294cee0c179184.zip cpython-b61c035dc2c625a99858efc353294cee0c179184.tar.gz cpython-b61c035dc2c625a99858efc353294cee0c179184.tar.bz2 | |
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.
........
| -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 00aee02..48b0258 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -691,6 +691,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.6.3 Core and Builtins ----------------- +- Issue #6846: Fix bug where bytearray.pop() returns negative integers. + - Issue #6707: dir() on an uninitialized module caused a crash. - Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 7eafce7..f6a5c16 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2758,7 +2758,7 @@ bytes_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__, |