diff options
| author | Andrew Kuchling <amk@amk.ca> | 2013-06-16 17:02:55 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2013-06-16 17:02:55 (GMT) |
| commit | f567727abcba9d3b56fd2d0254050eff23535d1a (patch) | |
| tree | 479246982709288ca4e8da7cd7e7718b0c4bd1cc /Modules/_io | |
| parent | 39295e7a55d03b9ef31c0d0dd27d129b1ad5a695 (diff) | |
| parent | c7b6c50f29fac4971e7271ac649ee3b7ef3deac7 (diff) | |
| download | cpython-f567727abcba9d3b56fd2d0254050eff23535d1a.zip cpython-f567727abcba9d3b56fd2d0254050eff23535d1a.tar.gz cpython-f567727abcba9d3b56fd2d0254050eff23535d1a.tar.bz2 | |
Merge with 3.3
Diffstat (limited to 'Modules/_io')
| -rw-r--r-- | Modules/_io/_iomodule.c | 4 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index b5cd176..4a7e758 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -168,8 +168,8 @@ PyDoc_STRVAR(open_doc, "'strict' to raise a ValueError exception if there is an encoding error\n" "(the default of None has the same effect), or pass 'ignore' to ignore\n" "errors. (Note that ignoring encoding errors can lead to data loss.)\n" -"See the documentation for codecs.register for a list of the permitted\n" -"encoding error strings.\n" +"See the documentation for codecs.register or run 'help(codecs.Codec)'\n" +"for a list of the permitted encoding error strings.\n" "\n" "newline controls how universal newlines works (it only applies to text\n" "mode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\n" diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 8bd9ba1..4d0009d 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -642,8 +642,9 @@ PyDoc_STRVAR(textiowrapper_doc, "encoding gives the name of the encoding that the stream will be\n" "decoded or encoded with. It defaults to locale.getpreferredencoding(False).\n" "\n" - "errors determines the strictness of encoding and decoding (see the\n" - "codecs.register) and defaults to \"strict\".\n" + "errors determines the strictness of encoding and decoding (see\n" + "help(codecs.Codec) or the documentation for codecs.register) and\n" + "defaults to \"strict\".\n" "\n" "newline controls how line endings are handled. It can be None, '',\n" "'\\n', '\\r', and '\\r\\n'. It works as follows:\n" |