From 52ddc0e7567fb927ca3a5cd1ed4243c3450a552e Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Thu, 23 Jul 1998 16:07:02 +0000 Subject: [PATCH] PyFile_FromString(): If an exception occurs, pass in the filename that was used so it's reflected in the IOError. Call PyErr_SetFromErrnoWithFilename(). --- Objects/fileobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Objects/fileobject.c b/Objects/fileobject.c index d43f113ea8c..d3b9894cae8 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -137,13 +137,14 @@ PyFile_FromString(name, mode) } if (f->f_fp == NULL) { #ifdef NO_FOPEN_ERRNO + /* Metroworks only, not testable, so unchanged */ if ( errno == 0 ) { PyErr_SetString(PyExc_IOError, "Cannot open file"); Py_DECREF(f); return NULL; } #endif - PyErr_SetFromErrno(PyExc_IOError); + PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); Py_DECREF(f); return NULL; }