From: Georg Brandl <georg@python.org>
Date: Sat, 3 Jan 2009 23:50:37 +0000 (+0000)
Subject: Merged revisions 68017 via svnmerge from
X-Git-Tag: v3.0.1~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcdfd50d6846d81a1c481b6fdf13a0d2db8c8506;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 68017 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r68017 | benjamin.peterson | 2008-12-29 19:02:28 +0100 (Mon, 29 Dec 2008) | 9 lines

  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/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 80de93ddb9f0..817103ed9973 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -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")
 
diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index b892993ae9ad..c36a5de1c96c 100644
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -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;
 	}