From: Victor Stinner Date: Wed, 14 May 2014 15:08:45 +0000 (+0200) Subject: Issue #21488: Fix doc of codecs.decode() and codecs.encode(), no keyword support. X-Git-Tag: v3.5.0a1~1659^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef5b4e3dc3b04327514d2e1704a8c8cd822d8beb;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 3729dac8ae..fb3af3bf37 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -22,9 +22,10 @@ manages the codec and error handling lookup process. It defines the following functions: -.. function:: encode(obj, encoding='utf-8', 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 ``utf-8``. *Errors* may be given to set the desired error handling scheme. The default error handler is ``strict`` meaning that encoding errors raise @@ -32,9 +33,10 @@ It defines the following functions: :exc:`UnicodeEncodeError`). Refer to :ref:`codec-base-classes` for more information on codec error handling. -.. function:: decode(obj, encoding='utf-8', 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 ``utf-8``. *Errors* may be given to set the desired error handling scheme. The default error handler is ``strict`` meaning that decoding errors raise diff --git a/Misc/ACKS b/Misc/ACKS index 75fb70657b..bbcd00e755 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -57,6 +57,7 @@ David Ascher Chris AtLee Aymeric Augustin John Aycock +Brad Aylsworth Donovan Baarda Arne Babenhauserheide Attila Babo