summaryrefslogtreecommitdiffstats
path: root/Modules/clinic
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-08-09 09:23:08 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-08-09 09:23:08 (GMT)
commitc97a962e089670a1d38d8676ebbc3f1801dd3111 (patch)
tree3346bb872b6290da8b3b2259b5c789bbb4982210 /Modules/clinic
parent83ee5a315ffbf6e6601cc5c5e7a692d249efb5ad (diff)
downloadcpython-c97a962e089670a1d38d8676ebbc3f1801dd3111.zip
cpython-c97a962e089670a1d38d8676ebbc3f1801dd3111.tar.gz
cpython-c97a962e089670a1d38d8676ebbc3f1801dd3111.tar.bz2
Issue #24824: Signatures of codecs.encode() and codecs.decode() now are
compatible with pydoc.
Diffstat (limited to 'Modules/clinic')
-rw-r--r--Modules/clinic/_codecsmodule.c.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h
index 2b97b18..e94be11 100644
--- a/Modules/clinic/_codecsmodule.c.h
+++ b/Modules/clinic/_codecsmodule.c.h
@@ -42,13 +42,12 @@ exit:
}
PyDoc_STRVAR(_codecs_encode__doc__,
-"encode($module, /, obj, encoding=sys.getdefaultencoding(),\n"
-" errors=\'strict\')\n"
+"encode($module, /, obj, encoding=\'utf-8\', errors=\'strict\')\n"
"--\n"
"\n"
"Encodes obj using the codec registered for encoding.\n"
"\n"
-"encoding defaults to the default encoding. errors may be given to set a\n"
+"The default encoding is \'utf-8\'. errors may be given to set a\n"
"different error handling scheme. Default is \'strict\' meaning that encoding\n"
"errors raise a ValueError. Other possible values are \'ignore\', \'replace\'\n"
"and \'backslashreplace\' as well as any other name registered with\n"
@@ -80,13 +79,12 @@ exit:
}
PyDoc_STRVAR(_codecs_decode__doc__,
-"decode($module, /, obj, encoding=sys.getdefaultencoding(),\n"
-" errors=\'strict\')\n"
+"decode($module, /, obj, encoding=\'utf-8\', errors=\'strict\')\n"
"--\n"
"\n"
"Decodes obj using the codec registered for encoding.\n"
"\n"
-"encoding defaults to the default encoding. errors may be given to set a\n"
+"Default encoding is \'utf-8\'. errors may be given to set a\n"
"different error handling scheme. Default is \'strict\' meaning that encoding\n"
"errors raise a ValueError. Other possible values are \'ignore\', \'replace\'\n"
"and \'backslashreplace\' as well as any other name registered with\n"
@@ -1395,4 +1393,4 @@ exit:
#ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF
#define _CODECS_CODE_PAGE_ENCODE_METHODDEF
#endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */
-/*[clinic end generated code: output=713a4081788da1bc input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9c9967048027c1c7 input=a9049054013a1b77]*/