From bb2e9c477d1cfb24f20ff979584af8fdb7b67a57 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 17 Dec 2011 23:18:07 +0100
Subject: [PATCH] Issue #11231: Fix bytes and bytearray docstrings

Patch written by Brice Berna.
---
 Misc/ACKS                 |  1 +
 Objects/bytearrayobject.c | 12 +++++-------
 Objects/bytesobject.c     |  7 ++++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
index 24923da367b..673c5467606 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -80,6 +80,7 @@ Andrew Bennetts
 Andy Bensky
 Michel Van den Bergh
 Julian Berman
+Brice Berna
 Eric Beser
 Steven Bethard
 Stephen Bevan
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 0b45394a4af..4202ff28e44 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -2797,18 +2797,16 @@ bytearray_methods[] = {
 PyDoc_STRVAR(bytearray_doc,
 "bytearray(iterable_of_ints) -> bytearray\n\
 bytearray(string, encoding[, errors]) -> bytearray\n\
-bytearray(bytes_or_bytearray) -> mutable copy of bytes_or_bytearray\n\
-bytearray(memory_view) -> bytearray\n\
+bytearray(bytes_or_buffer) -> mutable copy of bytes_or_buffer\n\
+bytearray(int) -> bytes array of size given by the parameter initialized with null bytes\n\
+bytearray() -> empty bytes array\n\
 \n\
 Construct an mutable bytearray object from:\n\
   - an iterable yielding integers in range(256)\n\
   - a text string encoded using the specified encoding\n\
-  - a bytes or a bytearray object\n\
+  - a bytes or a buffer object\n\
   - any object implementing the buffer API.\n\
-\n\
-bytearray(int) -> bytearray\n\
-\n\
-Construct a zero-initialized bytearray of the given length.");
+  - an integer");
 
 
 static PyObject *bytearray_iter(PyObject *seq);
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 8e35fa92769..b10cb5d3de5 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2721,13 +2721,14 @@ PyDoc_STRVAR(bytes_doc,
 "bytes(iterable_of_ints) -> bytes\n\
 bytes(string, encoding[, errors]) -> bytes\n\
 bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer\n\
-bytes(memory_view) -> bytes\n\
+bytes(int) -> bytes object of size given by the parameter initialized with null bytes\n\
+bytes() -> empty bytes object\n\
 \n\
 Construct an immutable array of bytes from:\n\
   - an iterable yielding integers in range(256)\n\
   - a text string encoded using the specified encoding\n\
-  - a bytes or a buffer object\n\
-  - any object implementing the buffer API.");
+  - any object implementing the buffer API.\n\
+  - an integer");
 
 static PyObject *bytes_iter(PyObject *seq);