diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-09-06 10:33:12 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-09-06 10:33:12 (GMT) |
| commit | 76e9643088ee709f1da4dd058da9806f49bc929a (patch) | |
| tree | 903f5cce6546261ba4f2c01eb80337faca8a34c6 | |
| parent | b61c035dc2c625a99858efc353294cee0c179184 (diff) | |
| download | cpython-76e9643088ee709f1da4dd058da9806f49bc929a.zip cpython-76e9643088ee709f1da4dd058da9806f49bc929a.tar.gz cpython-76e9643088ee709f1da4dd058da9806f49bc929a.tar.bz2 | |
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.
........
| -rw-r--r-- | Objects/bytearrayobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index f6a5c16..01c5e11 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2605,7 +2605,7 @@ bytes_insert(PyByteArrayObject *self, PyObject *args) 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)) @@ -2640,7 +2640,7 @@ bytes_append(PyByteArrayObject *self, PyObject *arg) 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) @@ -2741,7 +2741,7 @@ bytes_pop(PyByteArrayObject *self, PyObject *args) if (n == 0) { PyErr_SetString(PyExc_OverflowError, - "cannot pop an empty bytes"); + "cannot pop an empty bytearray"); return NULL; } if (where < 0) @@ -2779,7 +2779,7 @@ bytes_remove(PyByteArrayObject *self, PyObject *arg) 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)) |