summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2008-10-23 13:21:33 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2008-10-23 13:21:33 (GMT)
commit62073e0b516fd153c9414ded4cd908bcd78ca669 (patch)
tree9275180e7a6f1d518c8ca3da906c736ee6907f80 /Doc
parent5198a5c7aa77367765ae03542b561845094ca30d (diff)
downloadcpython-62073e0b516fd153c9414ded4cd908bcd78ca669.zip
cpython-62073e0b516fd153c9414ded4cd908bcd78ca669.tar.gz
cpython-62073e0b516fd153c9414ded4cd908bcd78ca669.tar.bz2
Merged revisions 67005 via svnmerge from
svn+ssh://pythondev@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). ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/codecs.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 9fff0a2..bc8bc7d 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -32,9 +32,9 @@ It defines the following functions:
* ``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 @@ It defines the following functions:
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.