From f10a79aad4e2fc62d2c3675e89f873b22b185e7b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 11 Oct 2008 00:49:57 +0000 Subject: merge from trunk --- Modules/cjkcodecs/multibytecodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Modules/cjkcodecs/multibytecodec.c') 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}; -- cgit v1.2.1