Merged revisions 74677 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74677 | mark.dickinson | 2009-09-06 11:32:21 +0100 (Sun, 06 Sep 2009) | 1 line
Issue #6847: s/bytes/bytearray/ in some bytearray error messages. Thanks Hagen Fürstenau.
........
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index f8f9469..835244a 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2552,7 +2552,7 @@
if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
- "cannot add more objects to bytes");
+ "cannot add more objects to bytearray");
return NULL;
}
if (!_getbytevalue(value, &ival))
@@ -2587,7 +2587,7 @@
return NULL;
if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError,
- "cannot add more objects to bytes");
+ "cannot add more objects to bytearray");
return NULL;
}
if (PyByteArray_Resize((PyObject *)self, n + 1) < 0)
@@ -2688,7 +2688,7 @@
if (n == 0) {
PyErr_SetString(PyExc_OverflowError,
- "cannot pop an empty bytes");
+ "cannot pop an empty bytearray");
return NULL;
}
if (where < 0)
@@ -2726,7 +2726,7 @@
break;
}
if (where == n) {
- PyErr_SetString(PyExc_ValueError, "value not found in bytes");
+ PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
return NULL;
}
if (!_canresize(self))