mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merged revisions 74679 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74679 | mark.dickinson | 2009-09-06 11:34:47 +0100 (Sun, 06 Sep 2009) | 9 lines

  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:35:38 +00:00
parent 424d75a3f5
commit 099d7a0ffb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/bytearrayobject.c
View file

@ -2552,7 +2552,7 @@ bytearray_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))
@ -2587,7 +2587,7 @@ bytearray_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)
@ -2688,7 +2688,7 @@ bytearray_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)
@ -2726,7 +2726,7 @@ bytearray_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))