cpython: dc670add1e28 (original) (raw)

Mercurial > cpython

changeset 74021:dc670add1e28

Issue #11231: Fix bytes and bytearray docstrings Patch written by Brice Berna. [#11231]

Victor Stinner victor.stinner@haypocalc.com
date	Sat, 17 Dec 2011 23🔞43 +0100
parents	b05caa600c40(current diff)beac7d6c7be4(diff)
children	75648db1b3f3
files	Misc/ACKS Objects/bytearrayobject.c Objects/bytesobject.c
diffstat	3 files changed, 10 insertions(+), 10 deletions(-)[+] [-] Misc/ACKS 1 Objects/bytearrayobject.c 12 Objects/bytesobject.c 7

line wrap: on

line diff

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -84,6 +84,7 @@ Andrew Bennetts Andy Bensky Michel Van den Bergh Julian Berman +Brice Berna Eric Beser Steven Bethard Stephen Bevan

--- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2890,18 +2890,16 @@ bytearray_methods[] = { PyDoc_STRVAR(bytearray_doc, "bytearray(iterable_of_ints) -> bytearray\n[](#l2.5) bytearray(string, encoding[, errors]) -> bytearray\n[](#l2.6) -bytearray(bytes_or_bytearray) -> mutable copy of bytes_or_bytearray\n[](#l2.7) -bytearray(memory_view) -> bytearray\n[](#l2.8) +bytearray(bytes_or_buffer) -> mutable copy of bytes_or_buffer\n[](#l2.9) +bytearray(int) -> bytes array of size given by the parameter initialized with null bytes\n[](#l2.10) +bytearray() -> empty bytes array\n[](#l2.11) \n[](#l2.12) Construct an mutable bytearray object from:\n[](#l2.13)

an iterable yielding integers in range(256)\n[](#l2.14)
a text string encoded using the specified encoding\n[](#l2.15)
- a bytes or a bytearray object\n[](#l2.16)

- a bytes or a buffer object\n[](#l2.17)
- any object implementing the buffer API.\n[](#l2.18) -\n[](#l2.19) -bytearray(int) -> bytearray\n[](#l2.20) -\n[](#l2.21) -Construct a zero-initialized bytearray of the given length.");
- an integer"); static PyObject *bytearray_iter(PyObject *seq);

--- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2732,13 +2732,14 @@ PyDoc_STRVAR(bytes_doc, "bytes(iterable_of_ints) -> bytes\n[](#l3.4) bytes(string, encoding[, errors]) -> bytes\n[](#l3.5) bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer\n[](#l3.6) -bytes(memory_view) -> bytes\n[](#l3.7) +bytes(int) -> bytes object of size given by the parameter initialized with null bytes\n[](#l3.8) +bytes() -> empty bytes object\n[](#l3.9) \n[](#l3.10) Construct an immutable array of bytes from:\n[](#l3.11)

an iterable yielding integers in range(256)\n[](#l3.12)
a text string encoded using the specified encoding\n[](#l3.13)
- a bytes or a buffer object\n[](#l3.14)
- any object implementing the buffer API.");

- any object implementing the buffer API.\n[](#l3.16)
- an integer"); static PyObject *bytes_iter(PyObject *seq);