Merge issue 19548 changes from 3.4

This commit is contained in:
Nick Coghlan 2015-01-07 00:37:01 +10:00
commit 582acb75e9
9 changed files with 432 additions and 385 deletions

View file

@ -54,9 +54,9 @@ PyDoc_STRVAR(register__doc__,
"register(search_function)\n\
\n\
Register a codec search function. Search functions are expected to take\n\
one argument, the encoding name in all lower case letters, and return\n\
a tuple of functions (encoder, decoder, stream_reader, stream_writer)\n\
(or a CodecInfo object).");
one argument, the encoding name in all lower case letters, and either\n\
return None, or a tuple of functions (encoder, decoder, stream_reader,\n\
stream_writer) (or a CodecInfo object).");
static
PyObject *codec_register(PyObject *self, PyObject *search_function)