Merged revisions 74675 via svnmerge from

mark.dickinson · mark.dickinson · commit e2e58dd26bbc · 2009-09-06T10:20:23.000Z
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. ........ ................ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74676 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -716,6 +716,8 @@ def test_pop(self):
         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
@@ -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
@@ -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__,

Original file line number	Diff line number	Diff line change
`@@ -2705,7 +2705,7 @@ bytearray_pop(PyByteArrayObject self, PyObject args)`
`2705`	`2705`	`if (PyByteArray_Resize((PyObject *)self, n - 1) < 0)`
`2706`	`2706`	`return NULL;`
`2707`	`2707`
`2708`		`- return PyLong_FromLong(value);`
	`2708`	`+ return PyLong_FromLong((unsigned char)value);`
`2709`	`2709`	`}`
`2710`	`2710`
`2711`	`2711`	`PyDoc_STRVAR(remove__doc__,`