traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Mark Dickinson 2009-09-06 10:33:12 +00:00
parent b61c035dc2
commit 76e9643088
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/bytearrayobject.c
View File

@ -2605,7 +2605,7 @@ bytes_insert(PyByteArrayObject *self, PyObject *args)
if (n == PY_SSIZE_T_MAX) { if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to bytes"); "cannot add more objects to bytearray");
return NULL; return NULL;
} }
if (!_getbytevalue(value, &ival)) if (!_getbytevalue(value, &ival))
@ -2640,7 +2640,7 @@ bytes_append(PyByteArrayObject *self, PyObject *arg)
return NULL; return NULL;
if (n == PY_SSIZE_T_MAX) { if (n == PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"cannot add more objects to bytes"); "cannot add more objects to bytearray");
return NULL; return NULL;
} }
if (PyByteArray_Resize((PyObject *)self, n + 1) < 0) if (PyByteArray_Resize((PyObject *)self, n + 1) < 0)
@ -2741,7 +2741,7 @@ bytes_pop(PyByteArrayObject *self, PyObject *args)
if (n == 0) { if (n == 0) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"cannot pop an empty bytes"); "cannot pop an empty bytearray");
return NULL; return NULL;
} }
if (where < 0) if (where < 0)
@ -2779,7 +2779,7 @@ bytes_remove(PyByteArrayObject *self, PyObject *arg)
break; break;
} }
if (where == n) { if (where == n) {
PyErr_SetString(PyExc_ValueError, "value not found in bytes"); PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
return NULL; return NULL;
} }
if (!_canresize(self)) if (!_canresize(self))