[Python-checkins] r74674 - in python/branches/release26-maint: Lib/test/test_bytes.py Misc/NEWS Objects/bytearrayobject.c

Sun Sep 6 12:05:28 CEST 2009

Author: mark.dickinson
Date: Sun Sep 6 12:05:28 2009
New Revision: 74674
Log:
Merged revisions 74673 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74673 | mark.dickinson | 2009年09月06日 11:03:31 +0100 (2009年9月06日) | 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.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/test/test_bytes.py
 python/branches/release26-maint/Misc/NEWS
 python/branches/release26-maint/Objects/bytearrayobject.c
Modified: python/branches/release26-maint/Lib/test/test_bytes.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_bytes.py	(original)
+++ python/branches/release26-maint/Lib/test/test_bytes.py	Sun Sep 6 12:05:28 2009
@@ -691,6 +691,8 @@
 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())
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Sep 6 12:05:28 2009
@@ -12,6 +12,8 @@
 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.
Modified: python/branches/release26-maint/Objects/bytearrayobject.c
==============================================================================
--- python/branches/release26-maint/Objects/bytearrayobject.c	(original)
+++ python/branches/release26-maint/Objects/bytearrayobject.c	Sun Sep 6 12:05:28 2009
@@ -2758,7 +2758,7 @@
 if (PyByteArray_Resize((PyObject *)self, n - 1) < 0)
 return NULL;
 
- return PyInt_FromLong(value);
+ return PyInt_FromLong((unsigned char)value);
 }
 
 PyDoc_STRVAR(remove__doc__,
