diff options
| -rw-r--r-- | Lib/test/test_fileio.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_fileio.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index c978779..d8cf415 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -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. diff --git a/Modules/_fileio.c b/Modules/_fileio.c index 65cc99d..ca12822 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -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; } |