From: Victor Stinner Date: Wed, 14 May 2014 15:07:08 +0000 (+0200) Subject: Issue #21488: Fix doc of codecs.decode() and codecs.encode(), no keyword support. X-Git-Tag: v2.7.7rc1~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07b16159b8eb195283f5264bcf4fabcfac99badb;p=python Issue #21488: Fix doc of codecs.decode() and codecs.encode(), no keyword support. Patch written by Brad Aylsworth. --- diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index f0e179b65b..05c715623b 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -23,24 +23,26 @@ manages the codec and error handling lookup process. It defines the following functions: -.. function:: encode(obj, encoding='ascii', errors='strict') +.. function:: encode(obj, [encoding[, errors]]) - Encodes *obj* using the codec registered for *encoding*. + Encodes *obj* using the codec registered for *encoding*. The default + encoding is ``'ascii'``. *Errors* may be given to set the desired error handling scheme. The - default error handler is ``strict`` meaning that encoding errors raise + default error handler is ``'strict'`` meaning that encoding errors raise :exc:`ValueError` (or a more codec specific subclass, such as :exc:`UnicodeEncodeError`). Refer to :ref:`codec-base-classes` for more information on codec error handling. .. versionadded:: 2.4 -.. function:: decode(obj, encoding='ascii', errors='strict') +.. function:: decode(obj, [encoding[, errors]]) - Decodes *obj* using the codec registered for *encoding*. + Decodes *obj* using the codec registered for *encoding*. The default + encoding is ``'ascii'``. *Errors* may be given to set the desired error handling scheme. The - default error handler is ``strict`` meaning that decoding errors raise + default error handler is ``'strict'`` meaning that decoding errors raise :exc:`ValueError` (or a more codec specific subclass, such as :exc:`UnicodeDecodeError`). Refer to :ref:`codec-base-classes` for more information on codec error handling. diff --git a/Misc/ACKS b/Misc/ACKS index c8c3880797..67f33f22d1 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -56,6 +56,7 @@ David Ascher Chris AtLee Aymeric Augustin John Aycock +Brad Aylsworth Donovan Baarda Arne Babenhauserheide Attila Babo