[Python-checkins] r68263 - in python/branches/release30-maint: Lib/test/test_fileio.py Modules/_fileio.c
georg.brandl
python-checkins at python.org
Sun Jan 4 00:50:37 CET 2009
Author: georg.brandl
Date: Sun Jan 4 00:50:37 2009
New Revision: 68263
Log:
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
........
................
Modified:
python/branches/release30-maint/ (props changed)
python/branches/release30-maint/Lib/test/test_fileio.py
python/branches/release30-maint/Modules/_fileio.c
Modified: python/branches/release30-maint/Lib/test/test_fileio.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_fileio.py (original)
+++ python/branches/release30-maint/Lib/test/test_fileio.py Sun Jan 4 00:50:37 2009
@@ -108,6 +108,7 @@
_fileio._FileIO('.', 'r')
except IOError as e:
self.assertNotEqual(e.errno, 0)
+ self.assertEqual(e.filename, ".")
else:
self.fail("Should have raised IOError")
Modified: python/branches/release30-maint/Modules/_fileio.c
==============================================================================
--- python/branches/release30-maint/Modules/_fileio.c (original)
+++ python/branches/release30-maint/Modules/_fileio.c Sun Jan 4 00:50:37 2009
@@ -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;
}
More information about the Python-checkins
mailing list