From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 6 Sep 2009 10:03:31 +0000 (+0000)
Subject: Issue #6846: bytearray.pop was returning ints in the range [-128, 128)
X-Git-Tag: v2.7a1~578
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a7c7c3b9c28dd2c0f9b81d807f8c7f60cb0924;p=thirdparty%2FPython%2Fcpython.git

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 ee4804f20226..615c9557503c 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -690,6 +690,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 07f90f139bdc..739726cfbbb2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1
 Core and Builtins
 -----------------
 
+- Issue #6846: Fix bug where bytearray.pop() returns negative integers.
+
 - classmethod no longer checks if its argument is callable.
 
 - Issue #6750: A text file opened with io.open() could duplicate its output
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 27b41bbf49d2..4105fa2cfaed 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2773,7 +2773,7 @@ bytearray_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__,