Merged revisions 68016 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68016 | benjamin.peterson | 2008-12-29 11:56:58 -0600 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index b892993..c36a5de 100644
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -116,7 +116,7 @@
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;
@@ -128,8 +128,8 @@
if (internal_close(self))
return -1;
- 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;
@@ -290,7 +290,7 @@
#endif
goto error;
}
- if(dircheck(self) < 0)
+ if(dircheck(self, name) < 0)
goto error;
}