diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-06 14:37:01 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-06 14:37:01 (GMT) |
| commit | 582acb75e9a03e21281fe3c3877b6d48a8f0fa8f (patch) | |
| tree | c8e497645e1ce8c0a6384a1063cac52d09dd02fe /Modules | |
| parent | 5d575399bca935fec36d6a1ba538115406673415 (diff) | |
| parent | b9fdb7a452c2b6f7a628118b5f695bd061b62cc8 (diff) | |
| download | cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.zip cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.tar.gz cpython-582acb75e9a03e21281fe3c3877b6d48a8f0fa8f.tar.bz2 | |
Merge issue 19548 changes from 3.4
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_codecsmodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 83aaa64..f25297a 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -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) |