mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Instantiate the OS-related exception as soon as we raise it, so that

Browse source 
"except" works properly.
This commit is contained in:
Antoine Pitrou 2011-10-12 19:39:57 +02:00
parent 1e4fe702f6
commit 5d6fbe8207
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/errors.c
View file

@ -341,7 +341,7 @@ PyObject *
PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
{
PyObject *message;
PyObject *v;
PyObject *v, *args;
int i = errno;
#ifndef MS_WINDOWS
char *s;
@ -410,14 +410,18 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
}
if (filenameObject != NULL)
v = Py_BuildValue("(iOO)", i, message, filenameObject);
args = Py_BuildValue("(iOO)", i, message, filenameObject);
else
v = Py_BuildValue("(iO)", i, message);
args = Py_BuildValue("(iO)", i, message);
Py_DECREF(message);
if (v != NULL) {
PyErr_SetObject(exc, v);
Py_DECREF(v);
if (args != NULL) {
v = PyObject_Call(exc, args, NULL);
Py_DECREF(args);
if (v != NULL) {
PyErr_SetObject((PyObject *) Py_TYPE(v), v);
Py_DECREF(v);
}
}
#ifdef MS_WINDOWS
LocalFree(s_buf);