diff options
| author | Georg Brandl <georg@python.org> | 2008-12-05 09:08:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-12-05 09:08:28 (GMT) |
| commit | fa71a907031b9342c47eef17a840d0488063801c (patch) | |
| tree | 808092f73be6610d1848e10623d12608093788f3 /Modules | |
| parent | 5667280a07cc12691709e2b5ffa9ac7e3a0172ee (diff) | |
| download | cpython-fa71a907031b9342c47eef17a840d0488063801c.zip cpython-fa71a907031b9342c47eef17a840d0488063801c.tar.gz cpython-fa71a907031b9342c47eef17a840d0488063801c.tar.bz2 | |
Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67326 | benjamin.peterson | 2008-11-22 02:59:15 +0100 (Sat, 22 Nov 2008) | 1 line
backport r67325: make FileIO.mode always contain 'b'
........
r67498 | raymond.hettinger | 2008-12-03 16:42:10 +0100 (Wed, 03 Dec 2008) | 1 line
Backport r67478
........
r67531 | georg.brandl | 2008-12-04 19:54:05 +0100 (Thu, 04 Dec 2008) | 2 lines
Add reference to enumerate() to indices example.
........
r67532 | georg.brandl | 2008-12-04 19:59:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Add another heapq example.
........
r67538 | georg.brandl | 2008-12-04 22:28:16 +0100 (Thu, 04 Dec 2008) | 2 lines
Clarification to avoid confusing output with file descriptors.
........
r67553 | georg.brandl | 2008-12-05 08:49:49 +0100 (Fri, 05 Dec 2008) | 2 lines
#4408: document regex.groups.
........
r67554 | georg.brandl | 2008-12-05 08:52:26 +0100 (Fri, 05 Dec 2008) | 2 lines
#4409: fix asterisks looking like footnotes.
........
r67556 | georg.brandl | 2008-12-05 09:02:17 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441: improve doc for os.open() flags.
........
r67557 | georg.brandl | 2008-12-05 09:06:57 +0100 (Fri, 05 Dec 2008) | 2 lines
Add an index entry for "subclassing immutable types".
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_fileio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/_fileio.c b/Modules/_fileio.c index b9310f3..65cc99d 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -208,6 +208,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) flags |= O_CREAT; append = 1; break; + case 'b': + break; case '+': if (plus) goto bad_mode; @@ -682,12 +684,12 @@ mode_string(PyFileIOObject *self) { if (self->readable) { if (self->writable) - return "r+"; + return "rb+"; else - return "r"; + return "rb"; } else - return "w"; + return "wb"; } static PyObject * |