Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
........
This commit is contained in:
Benjamin Peterson 2008-12-29 18:02:28 +00:00
parent 0b76601b6e
commit 1efc23cc35
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_fileio.py
View File

@ -108,6 +108,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")

8
Modules/_fileio.c
View File

@ -116,7 +116,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;
@ -128,8 +128,8 @@ dircheck(PyFileIOObject* self)
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 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
#endif
goto error;
}
if(dircheck(self) < 0)
if(dircheck(self, name) < 0)
goto error;
}