summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2011-03-04 06:14:56 +0000
committerEli Bendersky <eliben@gmail.com>2011-03-04 06:14:56 +0000
commitfdae1fd5f76b1322754c0dfb07f7e2212ec74560 (patch)
treec3230454ba8189bdca3ceceb9c543b96de0fae75 /Objects
parent21576364cdbc63a38eaa5a8e8701f3c367cac422 (diff)
downloadcpython-fdae1fd5f76b1322754c0dfb07f7e2212ec74560.tar.gz
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')
-rw-r--r--Objects/bytearrayobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 54ef3e7eab..86093955d8 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2355,8 +2355,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)