[Python-checkins] r74680 - in python/branches/release31-maint: Objects/bytearrayobject.c

Sun Sep 6 12:35:38 CEST 2009

Author: mark.dickinson
Date: Sun Sep 6 12:35:38 2009
New Revision: 74680
Log:
Merged revisions 74679 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r74679 | mark.dickinson | 2009年09月06日 11:34:47 +0100 (2009年9月06日) | 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 (2009年9月06日) | 1 line
 
 Issue #6847: s/bytes/bytearray/ in some bytearray error messages. Thanks Hagen Fürstenau.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Objects/bytearrayobject.c
Modified: python/branches/release31-maint/Objects/bytearrayobject.c
==============================================================================

--- python/branches/release31-maint/Objects/bytearrayobject.c	(original)
+++ python/branches/release31-maint/Objects/bytearrayobject.c	Sun Sep 6 12:35:38 2009
@@ -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))
