mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

PyErr_SetFromErrnoWithFilename(): New function which supports setting

Browse source 
an exception from errno, with a supplied filename (primarily used by
IOError and OSError).  If class exceptions are used then the exception
is instantiated with a 3-tuple: (errno, strerror, filename).  For
backwards compatibility reasons, if string exceptions are used,
filename is ignored.

PyErr_SetFromErrno(): Implement in terms of
PyErr_SetFromErrnoWithFilename().
This commit is contained in:
Barry Warsaw 1998-07-23 16:05:56 +00:00
parent 2dfe4de614
commit 97d951533e
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/errors.c
View file

@ -277,8 +277,9 @@ PyErr_NoMemory()
} }
PyObject * PyObject *
PyErr_SetFromErrno(exc) PyErr_SetFromErrnoWithFilename(exc, filename)
PyObject *exc; PyObject *exc;
char *filename;
{ {
PyObject *v; PyObject *v;
int i = errno; int i = errno;
@ -286,6 +287,9 @@ PyErr_SetFromErrno(exc)
if (i == EINTR && PyErr_CheckSignals()) if (i == EINTR && PyErr_CheckSignals())
return NULL; return NULL;
#endif #endif
if (filename != NULL && Py_UseClassExceptionsFlag)
v = Py_BuildValue("(iss)", i, strerror(i), filename);
else
v = Py_BuildValue("(is)", i, strerror(i)); v = Py_BuildValue("(is)", i, strerror(i));
if (v != NULL) { if (v != NULL) {
PyErr_SetObject(exc, v); PyErr_SetObject(exc, v);
@ -294,6 +298,14 @@ PyErr_SetFromErrno(exc)
return NULL; return NULL;
} }
PyObject *
PyErr_SetFromErrno(exc)
PyObject *exc;
{
return PyErr_SetFromErrnoWithFilename(exc, NULL);
}
void void
PyErr_BadInternalCall() PyErr_BadInternalCall()
{ {