From 0f22d69cf6cb5e1bcf7aab4a81836c466a88ec86 Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Thu, 1 Jan 2009 16:03:45 +0000 Subject: Merged revisions 68134 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r68134 | hirokazu.yamamoto | 2009-01-02 00:45:39 +0900 | 2 lines Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open file with `str' filename on Windows. ........ --- Misc/NEWS | 3 +++ Modules/_fileio.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 30668e6..c97daca 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 3.1 alpha 0 Core and Builtins ----------------- +- Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open + file with `str' filename on Windows. + - Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected. diff --git a/Modules/_fileio.c b/Modules/_fileio.c index c36a5de..8579e4e 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -284,10 +284,11 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) Py_END_ALLOW_THREADS if (self->fd < 0) { #ifdef MS_WINDOWS - PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename); -#else - PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); + if (widename != NULL) + PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename); + else #endif + PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); goto error; } if(dircheck(self, name) < 0) -- cgit v0.12