mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Fix SF buf #476953: Bad more for opening file gives bad msg.
If fopen() fails with EINVAL it means that the mode argument is invalid. Return the mode in the error message instead of the filename.
This commit is contained in:
parent
20747fa167
commit
41c8321252
2 changed files with 17 additions and 2 deletions
|
@ -121,13 +121,17 @@ open_the_file(PyFileObject *f, char *name, char *mode)
|
|||
if (f->f_fp == NULL) {
|
||||
#ifdef NO_FOPEN_ERRNO
|
||||
/* Metroworks only, not testable, so unchanged */
|
||||
if ( errno == 0 ) {
|
||||
if (errno == 0) {
|
||||
PyErr_SetString(PyExc_IOError, "Cannot open file");
|
||||
Py_DECREF(f);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
|
||||
if (errno == EINVAL)
|
||||
PyErr_Format(PyExc_IOError, "invalid argument: %s",
|
||||
mode);
|
||||
else
|
||||
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
|
||||
f = NULL;
|
||||
}
|
||||
return (PyObject *)f;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue