summaryrefslogtreecommitdiffstats
path: root/Objects/bytearrayobject.c
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2011-03-04 05:10:57 (GMT)
committerEli Bendersky <eliben@gmail.com>2011-03-04 05:10:57 (GMT)
commite0c8635d89f8d63808b3be66cccc36d7a7d3bdab (patch)
treea1d0b90f2e8a4c4a854f60ee2ac84e3d210bf77e /Objects/bytearrayobject.c
parent752b950e6b4d1f6f5d94d99050f30a128e44a1d6 (diff)
downloadcpython-e0c8635d89f8d63808b3be66cccc36d7a7d3bdab.zip
cpython-e0c8635d89f8d63808b3be66cccc36d7a7d3bdab.tar.gz
cpython-e0c8635d89f8d63808b3be66cccc36d7a7d3bdab.tar.bz2
Merged revisions 88735 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88735 | eli.bendersky | 2011-03-04 06:55:25 +0200 (Fri, 04 Mar 2011) | 2 lines Issue #11386: Fixed the exception thrown by bytearray.pop() for empty bytearrays ........
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r--Objects/bytearrayobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 7448354..aefec94 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2285,8 +2285,8 @@ bytearray_pop(PyByteArrayObject *self, PyObject *args)
return NULL;
if (n == 0) {
- PyErr_SetString(PyExc_OverflowError,
- "cannot pop an empty bytearray");
+ PyErr_SetString(PyExc_IndexError,
+ "pop from empty bytearray");
return NULL;
}
if (where < 0)