mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #29409: Implement PEP 529 for io.FileIO (Patch by Eryk Sun)

Browse source
This commit is contained in:
Steve Dower 2017-02-04 14:38:11 -08:00
parent bf0fc39edb
commit eacee98679
3 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Modules/_io/fileio.c
View file

@ -230,12 +230,13 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
int closefd, PyObject *opener)
/*[clinic end generated code: output=23413f68e6484bbd input=193164e293d6c097]*/
{
const char *name = NULL;
PyObject *stringobj = NULL;
const char *s;
#ifdef MS_WINDOWS
Py_UNICODE *widename = NULL;
#else
const char *name = NULL;
#endif
PyObject *stringobj = NULL;
const char *s;
int ret = 0;
int rwa = 0, plus = 0;
int flags = 0;
@ -277,24 +278,21 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
PyErr_Clear();
}
if (fd < 0) {
#ifdef MS_WINDOWS
if (PyUnicode_Check(nameobj)) {
Py_ssize_t length;
widename = PyUnicode_AsUnicodeAndSize(nameobj, &length);
if (widename == NULL)
return -1;
if (wcslen(widename) != length) {
PyErr_SetString(PyExc_ValueError, "embedded null character");
if (!PyUnicode_FSDecoder(nameobj, &stringobj)) {
return -1;
}
} else
#endif
if (fd < 0)
{
widename = PyUnicode_AsUnicodeAndSize(stringobj, &length);
if (widename == NULL)
return -1;
#else
if (!PyUnicode_FSConverter(nameobj, &stringobj)) {
return -1;
}
name = PyBytes_AS_STRING(stringobj);
#endif
}
s = mode;
@ -386,11 +384,10 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
do {
Py_BEGIN_ALLOW_THREADS
#ifdef MS_WINDOWS
if (widename != NULL)
self->fd = _wopen(widename, flags, 0666);
else
self->fd = _wopen(widename, flags, 0666);
#else
self->fd = open(name, flags, 0666);
#endif
self->fd = open(name, flags, 0666);
Py_END_ALLOW_THREADS
} while (self->fd < 0 && errno == EINTR &&
!(async_err = PyErr_CheckSignals()));