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 caea9094b1863fc9c9a50da6e2512f54847a50f6..dd01b936b26f9bb25656e489db085c4e789f4b24 100644 (file)
--- 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 9b189f5347e60c5e74efc42ce762f83800f8699c..45201cc58ac4317d063533015ea815901fc9eacc 100644 (file)
--- 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 f3d569712f65b43929badf1488633bcd09edac5a..f8f9469f5f4df161634494b5b271705ad514fa92 100644 (file)
--- 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__,