traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

"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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_pep3151.py
View File

@ -79,6 +79,18 @@ class HierarchyTest(unittest.TestCase):
e = SubOSError(EEXIST, "Bad file descriptor")
self.assertIs(type(e), SubOSError)
def test_try_except(self):
# This checks that try .. except checks the concrete exception
# (FileNotFoundError) and not the base type specified when
# PyErr_SetFromErrnoWithFilenameObject was called.
# (it is therefore deliberate that it doesn't use assertRaises)
try:
open("some_hopefully_non_existing_file")
except FileNotFoundError:
pass
else:
self.fail("should have raised a FileNotFoundError")
class AttributesTest(unittest.TestCase):

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);