Patch #1352711: make zipimport raise a complete IOError

birkenfeld · birkenfeld · commit e9b1949f70ff · 2006-02-19T09:38:58.000Z
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -434,8 +434,7 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
 
 	toc_entry = PyDict_GetItemString(self->files, path);
 	if (toc_entry == NULL) {
-		PyErr_Format(PyExc_IOError, "file not found [%.200s]",
-			     path);
+		PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
 		return NULL;
 	}
 	return get_data(PyString_AsString(self->archive), toc_entry);

Original file line number	Diff line number	Diff line change
`@@ -434,8 +434,7 @@ zipimporter_get_data(PyObject obj, PyObject args)`
`434`	`434`
`435`	`435`	`toc_entry = PyDict_GetItemString(self->files, path);`
`436`	`436`	`if (toc_entry == NULL) {`
`437`		`- PyErr_Format(PyExc_IOError, "file not found [%.200s]",`
`438`		`- path);`
	`437`	`+ PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);`
`439`	`438`	`return NULL;`
`440`	`439`	`}`
`441`	`440`	`return get_data(PyString_AsString(self->archive), toc_entry);`