[Python-checkins] cpython (merge default -> default): Merge default heads

Fri Mar 25 05:33:13 CET 2011

http://hg.python.org/cpython/rev/909c11cd3d85
changeset: 68914:909c11cd3d85
parent: 68913:82bbfd1cade2
parent: 68906:a729dfdbd24b
user: Kurt B. Kaiser <kbk at shore.net>
date: Thu Mar 24 23:41:20 2011 -0400
summary:
 Merge default heads
files:
 Objects/bytesobject.c | 8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -41,10 +41,6 @@
 #define PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1)
 
 /*
- For both PyBytes_FromString() and PyBytes_FromStringAndSize(), the
- parameter `size' denotes number of characters to allocate, not counting any
- null terminating character.
-
 For PyBytes_FromString(), the parameter `str' points to a null-terminated
 string containing exactly `size' bytes.
 
@@ -61,8 +57,8 @@
 
 The PyObject member `op->ob_size', which denotes the number of "extra
 items" in a variable-size object, will contain the number of bytes
- allocated for string data, not counting the null terminating character. It
- is therefore equal to the equal to the `size' parameter (for
+ allocated for string data, not counting the null terminating character.
+ It is therefore equal to the `size' parameter (for
 PyBytes_FromStringAndSize()) or the length of the string in the `str'
 parameter (for PyBytes_FromString()).
 */
-- 
Repository URL: http://hg.python.org/cpython
