[Python-3000-checkins] r67006 - in python/branches/py3k: Doc/library/codecs.rst

[walter.doerwald]

Author: walter.doerwald
Date: Thu Oct 23 15:21:33 2008
New Revision: 67006

Log:
Merged revisions 67005 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Do, 23 Okt 2008) | 2 lines

Use the correct names of the stateless codec functions (Fixes issue 4178).
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/library/codecs.rst

Modified: python/branches/py3k/Doc/library/codecs.rst
==============================================================================
--- python/branches/py3k/Doc/library/codecs.rst (original)
+++ python/branches/py3k/Doc/library/codecs.rst Thu Oct 23 15:21:33 2008
@@ -32,9 +32,9 @@

* ``name`` The name of the encoding;

- * ``encoder`` The stateless encoding function;
+ * ``encode`` The stateless encoding function;

- * ``decoder`` The stateless decoding function;
+ * ``decode`` The stateless decoding function;

* ``incrementalencoder`` An incremental encoder class or factory function;

@@ -46,7 +46,7 @@

The various functions or classes take the following arguments:

- *encoder* and *decoder*: These must be functions or methods which have the same
+ *encode* and *decode*: These must be functions or methods which have the same
interface as the :meth:`encode`/:meth:`decode` methods of Codec instances (see
Codec Interface). The functions/methods are expected to work in a stateless
mode.