#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
This commit is contained in:
parent
fe231b07e4
commit
7af65568ff
|
@ -109,6 +109,7 @@ class AutoFileTests(unittest.TestCase):
|
|||
_fileio._FileIO('.', 'r')
|
||||
except IOError as e:
|
||||
self.assertNotEqual(e.errno, 0)
|
||||
self.assertEqual(e.filename, ".")
|
||||
else:
|
||||
self.fail("Should have raised IOError")
|
||||
|
||||
|
|
|
@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 1
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #4764: With io.open, IOError.filename is set when trying to open a
|
||||
directory on POSIX systems.
|
||||
|
||||
- Issue #4764: IOError.filename is set when trying to open a directory on POSIX
|
||||
systems.
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ fileio_new(PyTypeObject *type, PyObject *args, PyObject *kews)
|
|||
directories, so we need a check. */
|
||||
|
||||
static int
|
||||
dircheck(PyFileIOObject* self)
|
||||
dircheck(PyFileIOObject* self, char *name)
|
||||
{
|
||||
#if defined(HAVE_FSTAT) && defined(S_IFDIR) && defined(EISDIR)
|
||||
struct stat buf;
|
||||
|
@ -109,8 +109,8 @@ dircheck(PyFileIOObject* self)
|
|||
PyObject *exc;
|
||||
internal_close(self);
|
||||
|
||||
exc = PyObject_CallFunction(PyExc_IOError, "(is)",
|
||||
EISDIR, msg);
|
||||
exc = PyObject_CallFunction(PyExc_IOError, "(iss)",
|
||||
EISDIR, msg, name);
|
||||
PyErr_SetObject(PyExc_IOError, exc);
|
||||
Py_XDECREF(exc);
|
||||
return -1;
|
||||
|
@ -271,7 +271,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
|
|||
#endif
|
||||
goto error;
|
||||
}
|
||||
if(dircheck(self) < 0)
|
||||
if(dircheck(self, name) < 0)
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue