mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18876: The FileIO.mode attribute now better reflects the actual mode under which the file was opened.

Browse source 
Patch by Erik Bray.
This commit is contained in:
Antoine Pitrou 2013-09-04 20:46:33 +02:00
parent c9e1dcdd53
commit e93b63b74b
3 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/_io/fileio.c
View file

@ -49,6 +49,7 @@ typedef struct {
unsigned int created : 1;
unsigned int readable : 1;
unsigned int writable : 1;
unsigned int appending : 1;
signed int seekable : 2; /* -1 means unknown */
unsigned int closefd : 1;
unsigned int deallocating: 1;
@ -156,6 +157,7 @@ fileio_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->created = 0;
self->readable = 0;
self->writable = 0;
self->appending = 0;
self->seekable = -1;
self->closefd = 1;
self->weakreflist = NULL;
@ -216,7 +218,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
Py_UNICODE *widename = NULL;
#endif
int ret = 0;
int rwa = 0, plus = 0, append = 0;
int rwa = 0, plus = 0;
int flags = 0;
int fd = -1;
int closefd = 1;
@ -309,8 +311,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
goto bad_mode;
rwa = 1;
self->writable = 1;
flags |= O_CREAT;
append = 1;
self->appending = 1;
flags |= O_APPEND | O_CREAT;
break;
case 'b':
break;
@ -341,11 +343,6 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
flags |= O_BINARY;
#endif
#ifdef O_APPEND
if (append)
flags |= O_APPEND;
#endif
if (fd >= 0) {
if (check_fd(fd))
goto error;
@ -411,7 +408,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
if (PyObject_SetAttrString((PyObject *)self, "name", nameobj) < 0)
goto error;
if (append) {
if (self->appending) {
/* For consistent behaviour, we explicitly seek to the
end of file (otherwise, it might be done only on the
first write()). */
@ -1012,7 +1009,13 @@ mode_string(fileio *self)
else
return "xb";
}
if (self->readable) {
if (self->appending) {
if (self->readable)
return "ab+";
else
return "ab";
}
else if (self->readable) {
if (self->writable)
return "rb+";
else