diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-10-11 00:49:57 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-10-11 00:49:57 +0000 |
| commit | f10a79aad4e2fc62d2c3675e89f873b22b185e7b (patch) | |
| tree | 06b042ca03a71663d26ad95949807d1bd2472bf4 /Modules/cjkcodecs | |
| parent | 2d8dcdcb06005858e87eded012ceff10920445b7 (diff) | |
| download | cpython-git-f10a79aad4e2fc62d2c3675e89f873b22b185e7b.tar.gz | |
merge from trunk
Diffstat (limited to 'Modules/cjkcodecs')
| -rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 67c25b1646..2732270903 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -36,7 +36,7 @@ PyDoc_STRVAR(MultibyteCodec_Decode__doc__, Decodes `string' using I, an MultibyteCodec instance. errors may be given\n\ to set a different error handling scheme. Default is 'strict' meaning\n\ that encoding errors raise a UnicodeDecodeError. Other possible values\n\ -are 'ignore' and 'replace' as well as any other name registerd with\n\ +are 'ignore' and 'replace' as well as any other name registered with\n\ codecs.register_error that is able to handle UnicodeDecodeErrors."); static char *codeckwarglist[] = {"input", "errors", NULL}; |