diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-10-11 00:49:57 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-10-11 00:49:57 (GMT) |
| commit | f10a79aad4e2fc62d2c3675e89f873b22b185e7b (patch) | |
| tree | 06b042ca03a71663d26ad95949807d1bd2472bf4 /Modules/_codecsmodule.c | |
| parent | 2d8dcdcb06005858e87eded012ceff10920445b7 (diff) | |
| download | cpython-f10a79aad4e2fc62d2c3675e89f873b22b185e7b.zip cpython-f10a79aad4e2fc62d2c3675e89f873b22b185e7b.tar.gz cpython-f10a79aad4e2fc62d2c3675e89f873b22b185e7b.tar.bz2 | |
merge from trunk
Diffstat (limited to 'Modules/_codecsmodule.c')
| -rw-r--r-- | Modules/_codecsmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 5026c05..fc3e3f9 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -108,7 +108,7 @@ Decodes obj using the codec registered for encoding. encoding defaults\n\ to the default encoding. errors may be given to set a different error\n\ handling scheme. Default is 'strict' meaning that encoding errors raise\n\ a ValueError. Other possible values are 'ignore' and 'replace'\n\ -as well as any other name registerd with codecs.register_error that is\n\ +as well as any other name registered with codecs.register_error that is\n\ able to handle ValueErrors."); static PyObject * |