[Python-checkins] r68139 - in python/branches/py3k: Misc/NEWS Modules/_fileio.c

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Thu Jan  1 17:03:45 2009
New Revision: 68139

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_fileio.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Jan  1 17:03:45 2009
@@ -12,6 +12,9 @@
 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.
 

Modified: python/branches/py3k/Modules/_fileio.c
==============================================================================
--- python/branches/py3k/Modules/_fileio.c	(original)
+++ python/branches/py3k/Modules/_fileio.c	Thu Jan  1 17:03:45 2009
@@ -284,10 +284,11 @@
 		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)