diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 07:17:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 07:17:29 (GMT) |
| commit | 8ffe0bc55fff676dc758da54e7dd35edd45c8cb8 (patch) | |
| tree | 43985217a9c8212c436ad07db2ca1682d69bbc27 /Modules | |
| parent | 107690c2ff6ad95934b66df2d2566177b7560827 (diff) | |
| download | cpython-8ffe0bc55fff676dc758da54e7dd35edd45c8cb8.zip cpython-8ffe0bc55fff676dc758da54e7dd35edd45c8cb8.tar.gz cpython-8ffe0bc55fff676dc758da54e7dd35edd45c8cb8.tar.bz2 | |
Merged revisions 76923,76926,77009,77082-77083,77085,77087,77121 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r76923 | georg.brandl | 2009-12-20 15:24:06 +0100 (So, 20 Dez 2009) | 1 line
#7493: more review fixes.
................
r76926 | georg.brandl | 2009-12-20 15:38:23 +0100 (So, 20 Dez 2009) | 9 lines
Recorded merge of revisions 76925 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76925 | georg.brandl | 2009-12-20 15:33:20 +0100 (So, 20 Dez 2009) | 1 line
#7381: subprocess documentation and library docstring consistency fixes.
........
................
r77009 | georg.brandl | 2009-12-23 11:30:45 +0100 (Mi, 23 Dez 2009) | 1 line
#7417: add signature to open() docstring.
................
r77082 | georg.brandl | 2009-12-28 08:59:20 +0100 (Mo, 28 Dez 2009) | 1 line
#7577: fix signature info for getbufferproc.
................
r77083 | georg.brandl | 2009-12-28 09:00:47 +0100 (Mo, 28 Dez 2009) | 9 lines
Merged revisions 77081 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77081 | georg.brandl | 2009-12-28 08:59:05 +0100 (Mo, 28 Dez 2009) | 1 line
#7577: fix signature of PyBuffer_FillInfo().
........
................
r77085 | georg.brandl | 2009-12-28 09:02:38 +0100 (Mo, 28 Dez 2009) | 9 lines
Merged revisions 77084 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77084 | georg.brandl | 2009-12-28 09:01:59 +0100 (Mo, 28 Dez 2009) | 1 line
#7586: fix typo.
........
................
r77087 | georg.brandl | 2009-12-28 09:10:38 +0100 (Mo, 28 Dez 2009) | 9 lines
Recorded merge of revisions 77086 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77086 | georg.brandl | 2009-12-28 09:09:32 +0100 (Mo, 28 Dez 2009) | 1 line
#7381: consistency update, and backport avoiding ``None >= 0`` check from py3k.
........
................
r77121 | georg.brandl | 2009-12-29 22:38:35 +0100 (Di, 29 Dez 2009) | 1 line
#7590: exception classes no longer are in the "exceptions" module. Also clean up text that was written with string exceptions in mind.
................
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_io/_iomodule.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 14a4356..e20a2f6 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -176,6 +176,9 @@ PyObject *PyExc_BlockingIOError = (PyObject *)&_PyExc_BlockingIOError; * The main open() function */ PyDoc_STRVAR(open_doc, +"open(file, mode='r', buffering=None, encoding=None,\n" +" errors=None, newline=None, closefd=True) -> file object\n" +"\n" "Open file and return a stream. Raise IOError upon failure.\n" "\n" "file is either a text or byte string giving the name (and the path\n" |