[Python-checkins] cpython (3.4): Issue #21488: Fix doc of codecs.decode() and codecs.encode(), no keyword
victor.stinner
python-checkins at python.org
Wed May 14 17:10:04 CEST 2014
http://hg.python.org/cpython/rev/2e116176a81f
changeset: 90698:2e116176a81f
branch: 3.4
parent: 90695:3b27f3acf0c4
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed May 14 17:08:45 2014 +0200
summary:
Issue #21488: Fix doc of codecs.decode() and codecs.encode(), no keyword support.
Patch written by Brad Aylsworth.
files:
Doc/library/codecs.rst | 10 ++++++----
Misc/ACKS | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -22,9 +22,10 @@
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 @@
: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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -57,6 +57,7 @@
Chris AtLee
Aymeric Augustin
John Aycock
+Brad Aylsworth
Donovan Baarda
Arne Babenhauserheide
Attila Babo
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list