summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2011-03-25 03:41:20 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2011-03-25 03:41:20 (GMT)
commite093b0d185f483f37a12b7517c27e04fd5263fd1 (patch)
treee5bd3722a2bcad3364b1207dd502c6911f3f37b7
parente88893ccc64f208a4af28c193f6442526f177876 (diff)
parent1aef6b6e1ee907bcea172373708f0c1cb94ef0ed (diff)
downloadcpython-e093b0d185f483f37a12b7517c27e04fd5263fd1.zip
cpython-e093b0d185f483f37a12b7517c27e04fd5263fd1.tar.gz
cpython-e093b0d185f483f37a12b7517c27e04fd5263fd1.tar.bz2
Merge default heads
-rw-r--r--Objects/bytesobject.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index fcc499e..2d7f16d 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -41,10 +41,6 @@ static PyBytesObject *nullstring;
#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 @@ static PyBytesObject *nullstring;
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()).
*/