summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-09-06 10:05:28 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-09-06 10:05:28 (GMT)
commitb61c035dc2c625a99858efc353294cee0c179184 (patch)
tree735adf492a55091e7132c13a38fdae5e645a1a9a /Objects
parent545e7203d4fe69dedde58487492b2b5db587ed25 (diff)
downloadcpython-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. ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytearrayobject.c2
1 files changed, 1 insertions, 1 deletions
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__,