diff options
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 1412 |
1 files changed, 303 insertions, 1109 deletions
diff --git a/Python/errors.c b/Python/errors.c index d65707e..d823e13 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -2,10 +2,6 @@ /* Error handling */ #include "Python.h" -#include "pycore_initconfig.h" -#include "pycore_pyerrors.h" -#include "pycore_pystate.h" -#include "pycore_traceback.h" #ifndef __STDC__ #ifndef MS_WINDOWS @@ -14,8 +10,8 @@ extern char *strerror(int); #endif #ifdef MS_WINDOWS -#include <windows.h> -#include <winbase.h> +#include "windows.h" +#include "winbase.h" #endif #include <ctype.h> @@ -24,21 +20,11 @@ extern char *strerror(int); extern "C" { #endif -_Py_IDENTIFIER(builtins); -_Py_IDENTIFIER(stderr); -_Py_IDENTIFIER(flush); - - -/* Forward declarations */ -static PyObject * -_PyErr_FormatV(PyThreadState *tstate, PyObject *exception, - const char *format, va_list vargs); - void -_PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value, - PyObject *traceback) +PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback) { + PyThreadState *tstate = PyThreadState_GET(); PyObject *oldtype, *oldvalue, *oldtraceback; if (traceback != NULL && !PyTraceBack_Check(traceback)) { @@ -64,165 +50,34 @@ _PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value, } void -PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback) -{ - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_Restore(tstate, type, value, traceback); -} - - -_PyErr_StackItem * -_PyErr_GetTopmostException(PyThreadState *tstate) -{ - _PyErr_StackItem *exc_info = tstate->exc_info; - while ((exc_info->exc_type == NULL || exc_info->exc_type == Py_None) && - exc_info->previous_item != NULL) - { - exc_info = exc_info->previous_item; - } - return exc_info; -} - -static PyObject* -_PyErr_CreateException(PyObject *exception, PyObject *value) -{ - if (value == NULL || value == Py_None) { - return _PyObject_CallNoArg(exception); - } - else if (PyTuple_Check(value)) { - return PyObject_Call(exception, value, NULL); - } - else { - return _PyObject_CallOneArg(exception, value); - } -} - -void -_PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value) -{ - PyObject *exc_value; - PyObject *tb = NULL; - - if (exception != NULL && - !PyExceptionClass_Check(exception)) { - _PyErr_Format(tstate, PyExc_SystemError, - "exception %R not a BaseException subclass", - exception); - return; - } - - Py_XINCREF(value); - exc_value = _PyErr_GetTopmostException(tstate)->exc_value; - if (exc_value != NULL && exc_value != Py_None) { - /* Implicit exception chaining */ - Py_INCREF(exc_value); - if (value == NULL || !PyExceptionInstance_Check(value)) { - /* We must normalize the value right now */ - PyObject *fixed_value; - - /* Issue #23571: functions must not be called with an - exception set */ - _PyErr_Clear(tstate); - - fixed_value = _PyErr_CreateException(exception, value); - Py_XDECREF(value); - if (fixed_value == NULL) { - Py_DECREF(exc_value); - return; - } - - value = fixed_value; - } - - /* Avoid reference cycles through the context chain. - This is O(chain length) but context chains are - usually very short. Sensitive readers may try - to inline the call to PyException_GetContext. */ - if (exc_value != value) { - PyObject *o = exc_value, *context; - while ((context = PyException_GetContext(o))) { - Py_DECREF(context); - if (context == value) { - PyException_SetContext(o, NULL); - break; - } - o = context; - } - PyException_SetContext(value, exc_value); - } - else { - Py_DECREF(exc_value); - } - } - if (value != NULL && PyExceptionInstance_Check(value)) - tb = PyException_GetTraceback(value); - Py_XINCREF(exception); - _PyErr_Restore(tstate, exception, value, tb); -} - -void PyErr_SetObject(PyObject *exception, PyObject *value) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_SetObject(tstate, exception, value); -} - -/* Set a key error with the specified argument, wrapping it in a - * tuple automatically so that tuple keys are not unpacked as the - * exception arguments. */ -void -_PyErr_SetKeyError(PyObject *arg) -{ - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *tup = PyTuple_Pack(1, arg); - if (!tup) { - /* caller will expect error to be set anyway */ - return; - } - _PyErr_SetObject(tstate, PyExc_KeyError, tup); - Py_DECREF(tup); -} - -void -_PyErr_SetNone(PyThreadState *tstate, PyObject *exception) -{ - _PyErr_SetObject(tstate, exception, (PyObject *)NULL); + Py_XINCREF(exception); + Py_XINCREF(value); + PyErr_Restore(exception, value, (PyObject *)NULL); } - void PyErr_SetNone(PyObject *exception) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_SetNone(tstate, exception); -} - - -void -_PyErr_SetString(PyThreadState *tstate, PyObject *exception, - const char *string) -{ - PyObject *value = PyUnicode_FromString(string); - _PyErr_SetObject(tstate, exception, value); - Py_XDECREF(value); + PyErr_SetObject(exception, (PyObject *)NULL); } void PyErr_SetString(PyObject *exception, const char *string) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_SetString(tstate, exception, string); + PyObject *value = PyString_FromString(string); + PyErr_SetObject(exception, value); + Py_XDECREF(value); } -PyObject* _Py_HOT_FUNCTION +PyObject * PyErr_Occurred(void) { - /* The caller must hold the GIL. */ - assert(PyGILState_Check()); + PyThreadState *tstate = PyThreadState_GET(); - PyThreadState *tstate = _PyThreadState_GET(); - return _PyErr_Occurred(tstate); + return tstate->curexc_type; } @@ -251,7 +106,25 @@ PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc) err = PyExceptionInstance_Class(err); if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) { - return PyType_IsSubtype((PyTypeObject *)err, (PyTypeObject *)exc); + int res = 0, reclimit; + PyObject *exception, *value, *tb; + PyErr_Fetch(&exception, &value, &tb); + /* Temporarily bump the recursion limit, so that in the most + common case PyObject_IsSubclass will not raise a recursion + error we have to ignore anyway. Don't do it when the limit + is already insanely high, to avoid overflow */ + reclimit = Py_GetRecursionLimit(); + if (reclimit < (1 << 30)) + Py_SetRecursionLimit(reclimit + 5); + res = PyObject_IsSubclass(err, exc); + Py_SetRecursionLimit(reclimit); + /* This function must not fail, so print the error here */ + if (res == -1) { + PyErr_WriteUnraisable(err); + res = 0; + } + PyErr_Restore(exception, value, tb); + return res; } return err == exc; @@ -259,45 +132,29 @@ PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc) int -_PyErr_ExceptionMatches(PyThreadState *tstate, PyObject *exc) -{ - return PyErr_GivenExceptionMatches(_PyErr_Occurred(tstate), exc); -} - - -int PyErr_ExceptionMatches(PyObject *exc) { - PyThreadState *tstate = _PyThreadState_GET(); - return _PyErr_ExceptionMatches(tstate, exc); + return PyErr_GivenExceptionMatches(PyErr_Occurred(), exc); } -#ifndef Py_NORMALIZE_RECURSION_LIMIT -#define Py_NORMALIZE_RECURSION_LIMIT 32 -#endif - /* Used in many places to normalize a raised exception, including in eval_code2(), do_raise(), and PyErr_Print() - - XXX: should PyErr_NormalizeException() also call - PyException_SetTraceback() with the resulting value and tb? */ void -_PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc, - PyObject **val, PyObject **tb) +PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) { - int recursion_depth = 0; - PyObject *type, *value, *initial_tb; + PyObject *type = *exc; + PyObject *value = *val; + PyObject *inclass = NULL; + PyObject *initial_tb = NULL; + PyThreadState *tstate = NULL; - restart: - type = *exc; if (type == NULL) { /* There was no exception, so nothing to do. */ return; } - value = *val; /* If PyErr_SetNone() was used, the value will have been actually set to NULL. */ @@ -306,99 +163,88 @@ _PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc, Py_INCREF(value); } + if (PyExceptionInstance_Check(value)) + inclass = PyExceptionInstance_Class(value); + /* Normalize the exception so that if the type is a class, the value will be an instance. */ if (PyExceptionClass_Check(type)) { - PyObject *inclass = NULL; - int is_subclass = 0; - - if (PyExceptionInstance_Check(value)) { - inclass = PyExceptionInstance_Class(value); - is_subclass = PyObject_IsSubclass(inclass, type); - if (is_subclass < 0) { - goto error; - } - } - - /* If the value was not an instance, or is not an instance + /* if the value was not an instance, or is not an instance whose class is (or is derived from) type, then use the value as an argument to instantiation of the type class. */ - if (!is_subclass) { - PyObject *fixed_value = _PyErr_CreateException(type, value); - if (fixed_value == NULL) { - goto error; + if (!inclass || !PyObject_IsSubclass(inclass, type)) { + PyObject *args, *res; + + if (value == Py_None) + args = PyTuple_New(0); + else if (PyTuple_Check(value)) { + Py_INCREF(value); + args = value; } + else + args = PyTuple_Pack(1, value); + + if (args == NULL) + goto finally; + res = PyEval_CallObject(type, args); + Py_DECREF(args); + if (res == NULL) + goto finally; Py_DECREF(value); - value = fixed_value; + value = res; } - /* If the class of the instance doesn't exactly match the - class of the type, believe the instance. + /* if the class of the instance doesn't exactly match the + class of the type, believe the instance */ else if (inclass != type) { - Py_INCREF(inclass); Py_DECREF(type); type = inclass; + Py_INCREF(type); } } *exc = type; *val = value; return; - - error: +finally: Py_DECREF(type); Py_DECREF(value); - recursion_depth++; - if (recursion_depth == Py_NORMALIZE_RECURSION_LIMIT) { - _PyErr_SetString(tstate, PyExc_RecursionError, - "maximum recursion depth exceeded " - "while normalizing an exception"); - } /* If the new exception doesn't set a traceback and the old exception had a traceback, use the old traceback for the new exception. It's better than nothing. */ initial_tb = *tb; - _PyErr_Fetch(tstate, exc, val, tb); - assert(*exc != NULL); + PyErr_Fetch(exc, val, tb); if (initial_tb != NULL) { if (*tb == NULL) *tb = initial_tb; else Py_DECREF(initial_tb); } - /* Abort when Py_NORMALIZE_RECURSION_LIMIT has been exceeded, and the - corresponding RecursionError could not be normalized, and the - MemoryError raised when normalize this RecursionError could not be - normalized. */ - if (recursion_depth >= Py_NORMALIZE_RECURSION_LIMIT + 2) { - if (PyErr_GivenExceptionMatches(*exc, PyExc_MemoryError)) { - Py_FatalError("Cannot recover from MemoryErrors " - "while normalizing exceptions."); - } - else { - Py_FatalError("Cannot recover from the recursive normalization " - "of an exception."); - } + /* normalize recursively */ + tstate = PyThreadState_GET(); + if (++tstate->recursion_depth > Py_GetRecursionLimit()) { + --tstate->recursion_depth; + /* throw away the old exception and use the recursion error instead */ + Py_INCREF(PyExc_RuntimeError); + Py_SETREF(*exc, PyExc_RuntimeError); + Py_INCREF(PyExc_RecursionErrorInst); + Py_SETREF(*val, PyExc_RecursionErrorInst); + /* just keeping the old traceback */ + return; } - goto restart; + PyErr_NormalizeException(exc, val, tb); + --tstate->recursion_depth; } void -PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) +PyErr_Fetch(PyObject **p_type, PyObject **p_value, PyObject **p_traceback) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_NormalizeException(tstate, exc, val, tb); -} - + PyThreadState *tstate = PyThreadState_GET(); -void -_PyErr_Fetch(PyThreadState *tstate, PyObject **p_type, PyObject **p_value, - PyObject **p_traceback) -{ *p_type = tstate->curexc_type; *p_value = tstate->curexc_value; *p_traceback = tstate->curexc_traceback; @@ -408,217 +254,88 @@ _PyErr_Fetch(PyThreadState *tstate, PyObject **p_type, PyObject **p_value, tstate->curexc_traceback = NULL; } - -void -PyErr_Fetch(PyObject **p_type, PyObject **p_value, PyObject **p_traceback) -{ - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_Fetch(tstate, p_type, p_value, p_traceback); -} - - -void -_PyErr_Clear(PyThreadState *tstate) -{ - _PyErr_Restore(tstate, NULL, NULL, NULL); -} - - void PyErr_Clear(void) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_Clear(tstate); -} - - -void -PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback) -{ - PyThreadState *tstate = _PyThreadState_GET(); - - _PyErr_StackItem *exc_info = _PyErr_GetTopmostException(tstate); - *p_type = exc_info->exc_type; - *p_value = exc_info->exc_value; - *p_traceback = exc_info->exc_traceback; - - - Py_XINCREF(*p_type); - Py_XINCREF(*p_value); - Py_XINCREF(*p_traceback); + PyErr_Restore(NULL, NULL, NULL); } -void -PyErr_SetExcInfo(PyObject *p_type, PyObject *p_value, PyObject *p_traceback) -{ - PyObject *oldtype, *oldvalue, *oldtraceback; - PyThreadState *tstate = _PyThreadState_GET(); - - oldtype = tstate->exc_info->exc_type; - oldvalue = tstate->exc_info->exc_value; - oldtraceback = tstate->exc_info->exc_traceback; - - tstate->exc_info->exc_type = p_type; - tstate->exc_info->exc_value = p_value; - tstate->exc_info->exc_traceback = p_traceback; - - Py_XDECREF(oldtype); - Py_XDECREF(oldvalue); - Py_XDECREF(oldtraceback); -} - -/* Like PyErr_Restore(), but if an exception is already set, - set the context associated with it. +/* Restore previously fetched exception if an exception is not set, + otherwise drop previously fetched exception. + Like _PyErr_ChainExceptions() in Python 3, but doesn't set the context. */ void -_PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb) +_PyErr_ReplaceException(PyObject *exc, PyObject *val, PyObject *tb) { if (exc == NULL) return; - PyThreadState *tstate = _PyThreadState_GET(); - if (_PyErr_Occurred(tstate)) { - PyObject *exc2, *val2, *tb2; - _PyErr_Fetch(tstate, &exc2, &val2, &tb2); - _PyErr_NormalizeException(tstate, &exc, &val, &tb); - if (tb != NULL) { - PyException_SetTraceback(val, tb); - Py_DECREF(tb); - } + if (PyErr_Occurred()) { Py_DECREF(exc); - _PyErr_NormalizeException(tstate, &exc2, &val2, &tb2); - PyException_SetContext(val2, val); - _PyErr_Restore(tstate, exc2, val2, tb2); + Py_XDECREF(val); + Py_XDECREF(tb); } else { - _PyErr_Restore(tstate, exc, val, tb); + PyErr_Restore(exc, val, tb); } } -static PyObject * -_PyErr_FormatVFromCause(PyThreadState *tstate, PyObject *exception, - const char *format, va_list vargs) -{ - PyObject *exc, *val, *val2, *tb; - - assert(_PyErr_Occurred(tstate)); - _PyErr_Fetch(tstate, &exc, &val, &tb); - _PyErr_NormalizeException(tstate, &exc, &val, &tb); - if (tb != NULL) { - PyException_SetTraceback(val, tb); - Py_DECREF(tb); - } - Py_DECREF(exc); - assert(!_PyErr_Occurred(tstate)); - - _PyErr_FormatV(tstate, exception, format, vargs); - - _PyErr_Fetch(tstate, &exc, &val2, &tb); - _PyErr_NormalizeException(tstate, &exc, &val2, &tb); - Py_INCREF(val); - PyException_SetCause(val2, val); - PyException_SetContext(val2, val); - _PyErr_Restore(tstate, exc, val2, tb); - - return NULL; -} - -PyObject * -_PyErr_FormatFromCauseTstate(PyThreadState *tstate, PyObject *exception, - const char *format, ...) -{ - va_list vargs; -#ifdef HAVE_STDARG_PROTOTYPES - va_start(vargs, format); -#else - va_start(vargs); -#endif - _PyErr_FormatVFromCause(tstate, exception, format, vargs); - va_end(vargs); - return NULL; -} - -PyObject * -_PyErr_FormatFromCause(PyObject *exception, const char *format, ...) -{ - PyThreadState *tstate = _PyThreadState_GET(); - va_list vargs; -#ifdef HAVE_STDARG_PROTOTYPES - va_start(vargs, format); -#else - va_start(vargs); -#endif - _PyErr_FormatVFromCause(tstate, exception, format, vargs); - va_end(vargs); - return NULL; -} - /* Convenience functions to set a type error exception and return 0 */ int PyErr_BadArgument(void) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_SetString(tstate, PyExc_TypeError, - "bad argument type for built-in operation"); + PyErr_SetString(PyExc_TypeError, + "bad argument type for built-in operation"); return 0; } PyObject * -_PyErr_NoMemory(PyThreadState *tstate) -{ - if (Py_TYPE(PyExc_MemoryError) == NULL) { - /* PyErr_NoMemory() has been called before PyExc_MemoryError has been - initialized by _PyExc_Init() */ - Py_FatalError("Out of memory and PyExc_MemoryError is not " - "initialized yet"); - } - _PyErr_SetNone(tstate, PyExc_MemoryError); - return NULL; -} - -PyObject * PyErr_NoMemory(void) { - PyThreadState *tstate = _PyThreadState_GET(); - return _PyErr_NoMemory(tstate); -} + if (PyErr_ExceptionMatches(PyExc_MemoryError)) + /* already current */ + return NULL; -PyObject * -PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) -{ - return PyErr_SetFromErrnoWithFilenameObjects(exc, filenameObject, NULL); + /* raise the pre-allocated instance if it still exists */ + if (PyExc_MemoryErrorInst) + PyErr_SetObject(PyExc_MemoryError, PyExc_MemoryErrorInst); + else + /* this will probably fail since there's no memory and hee, + hee, we have to instantiate this class + */ + PyErr_SetNone(PyExc_MemoryError); + + return NULL; } PyObject * -PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, PyObject *filenameObject2) +PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) { - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *message; - PyObject *v, *args; + PyObject *v; + char *s; int i = errno; +#ifdef PLAN9 + char errbuf[ERRMAX]; +#endif #ifdef MS_WINDOWS - WCHAR *s_buf = NULL; -#endif /* Unix/Windows */ - + char *s_buf = NULL; + char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */ +#endif #ifdef EINTR if (i == EINTR && PyErr_CheckSignals()) return NULL; #endif - -#ifndef MS_WINDOWS - if (i != 0) { - char *s = strerror(i); - message = PyUnicode_DecodeLocale(s, "surrogateescape"); - } - else { - /* Sometimes errno didn't get set */ - message = PyUnicode_FromString("Error"); - } +#ifdef PLAN9 + rerrstr(errbuf, sizeof errbuf); + s = errbuf; #else if (i == 0) - message = PyUnicode_FromString("Error"); /* Sometimes errno didn't get set */ + s = "Error"; /* Sometimes errno didn't get set */ else +#ifndef MS_WINDOWS + s = strerror(i); +#else { /* Note that the Win32 errors do not lineup with the errno error. So if the error is in the MSVC error @@ -626,10 +343,10 @@ PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, P a Win32 error code */ if (i > 0 && i < _sys_nerr) { - message = PyUnicode_FromString(_sys_errlist[i]); + s = _sys_errlist[i]; } else { - int len = FormatMessageW( + int len = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, @@ -638,50 +355,32 @@ PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, P MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPWSTR) &s_buf, + (LPTSTR) &s_buf, 0, /* size not used */ NULL); /* no args */ if (len==0) { /* Only ever seen this in out-of-mem situations */ + sprintf(s_small_buf, "Windows Error 0x%X", i); + s = s_small_buf; s_buf = NULL; - message = PyUnicode_FromFormat("Windows Error 0x%x", i); } else { + s = s_buf; /* remove trailing cr/lf and dots */ - while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) - s_buf[--len] = L'\0'; - message = PyUnicode_FromWideChar(s_buf, len); + while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) + s[--len] = '\0'; } } } #endif /* Unix/Windows */ - - if (message == NULL) - { -#ifdef MS_WINDOWS - LocalFree(s_buf); -#endif - return NULL; - } - - if (filenameObject != NULL) { - if (filenameObject2 != NULL) - args = Py_BuildValue("(iOOiO)", i, message, filenameObject, 0, filenameObject2); - else - args = Py_BuildValue("(iOO)", i, message, filenameObject); - } else { - assert(filenameObject2 == NULL); - args = Py_BuildValue("(iO)", i, message); - } - Py_DECREF(message); - - if (args != NULL) { - v = PyObject_Call(exc, args, NULL); - Py_DECREF(args); - if (v != NULL) { - _PyErr_SetObject(tstate, (PyObject *) Py_TYPE(v), v); - Py_DECREF(v); - } +#endif /* PLAN 9*/ + if (filenameObject != NULL) + v = Py_BuildValue("(isO)", i, s, filenameObject); + else + v = Py_BuildValue("(is)", i, s); + if (v != NULL) { + PyErr_SetObject(exc, v); + Py_DECREF(v); } #ifdef MS_WINDOWS LocalFree(s_buf); @@ -689,11 +388,12 @@ PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, P return NULL; } + PyObject * PyErr_SetFromErrnoWithFilename(PyObject *exc, const char *filename) { - PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; - PyObject *result = PyErr_SetFromErrnoWithFilenameObjects(exc, name, NULL); + PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); Py_XDECREF(name); return result; } @@ -702,8 +402,10 @@ PyErr_SetFromErrnoWithFilename(PyObject *exc, const char *filename) PyObject * PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename) { - PyObject *name = filename ? PyUnicode_FromWideChar(filename, -1) : NULL; - PyObject *result = PyErr_SetFromErrnoWithFilenameObjects(exc, name, NULL); + PyObject *name = filename ? + PyUnicode_FromUnicode(filename, wcslen(filename)) : + NULL; + PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); Py_XDECREF(name); return result; } @@ -712,7 +414,7 @@ PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename) PyObject * PyErr_SetFromErrno(PyObject *exc) { - return PyErr_SetFromErrnoWithFilenameObjects(exc, NULL, NULL); + return PyErr_SetFromErrnoWithFilenameObject(exc, NULL); } #ifdef MS_WINDOWS @@ -722,28 +424,14 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject( int ierr, PyObject *filenameObject) { - return PyErr_SetExcFromWindowsErrWithFilenameObjects(exc, ierr, - filenameObject, NULL); -} - -PyObject *PyErr_SetExcFromWindowsErrWithFilenameObjects( - PyObject *exc, - int ierr, - PyObject *filenameObject, - PyObject *filenameObject2) -{ - PyThreadState *tstate = _PyThreadState_GET(); int len; - WCHAR *s_buf = NULL; /* Free via LocalFree */ - PyObject *message; - PyObject *args, *v; - + char *s; + char *s_buf = NULL; /* Free via LocalFree */ + char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */ + PyObject *v; DWORD err = (DWORD)ierr; - if (err==0) { - err = GetLastError(); - } - - len = FormatMessageW( + if (err==0) err = GetLastError(); + len = FormatMessage( /* Error API error */ FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | @@ -752,44 +440,27 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObjects( err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPWSTR) &s_buf, + (LPTSTR) &s_buf, 0, /* size not used */ NULL); /* no args */ if (len==0) { /* Only seen this in out of mem situations */ - message = PyUnicode_FromFormat("Windows Error 0x%x", err); + sprintf(s_small_buf, "Windows Error 0x%X", err); + s = s_small_buf; s_buf = NULL; } else { + s = s_buf; /* remove trailing cr/lf and dots */ - while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) - s_buf[--len] = L'\0'; - message = PyUnicode_FromWideChar(s_buf, len); + while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) + s[--len] = '\0'; } - - if (message == NULL) - { - LocalFree(s_buf); - return NULL; - } - - if (filenameObject == NULL) { - assert(filenameObject2 == NULL); - filenameObject = filenameObject2 = Py_None; - } - else if (filenameObject2 == NULL) - filenameObject2 = Py_None; - /* This is the constructor signature for OSError. - The POSIX translation will be figured out by the constructor. */ - args = Py_BuildValue("(iOOiO)", 0, message, filenameObject, err, filenameObject2); - Py_DECREF(message); - - if (args != NULL) { - v = PyObject_Call(exc, args, NULL); - Py_DECREF(args); - if (v != NULL) { - _PyErr_SetObject(tstate, (PyObject *) Py_TYPE(v), v); - Py_DECREF(v); - } + if (filenameObject != NULL) + v = Py_BuildValue("(isO)", err, s, filenameObject); + else + v = Py_BuildValue("(is)", err, s); + if (v != NULL) { + PyErr_SetObject(exc, v); + Py_DECREF(v); } LocalFree(s_buf); return NULL; @@ -800,11 +471,10 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilename( int ierr, const char *filename) { - PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; - PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObjects(exc, + PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, ierr, - name, - NULL); + name); Py_XDECREF(name); return ret; } @@ -814,11 +484,12 @@ PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename( int ierr, const Py_UNICODE *filename) { - PyObject *name = filename ? PyUnicode_FromWideChar(filename, -1) : NULL; - PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObjects(exc, + PyObject *name = filename ? + PyUnicode_FromUnicode(filename, wcslen(filename)) : + NULL; + PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, ierr, - name, - NULL); + name); Py_XDECREF(name); return ret; } @@ -830,18 +501,17 @@ PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr) PyObject *PyErr_SetFromWindowsErr(int ierr) { - return PyErr_SetExcFromWindowsErrWithFilename(PyExc_OSError, + return PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError, ierr, NULL); } - PyObject *PyErr_SetFromWindowsErrWithFilename( int ierr, const char *filename) { - PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; - PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObjects( - PyExc_OSError, - ierr, name, NULL); + PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( + PyExc_WindowsError, + ierr, name); Py_XDECREF(name); return result; } @@ -850,81 +520,23 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( int ierr, const Py_UNICODE *filename) { - PyObject *name = filename ? PyUnicode_FromWideChar(filename, -1) : NULL; - PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObjects( - PyExc_OSError, - ierr, name, NULL); + PyObject *name = filename ? + PyUnicode_FromUnicode(filename, wcslen(filename)) : + NULL; + PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( + PyExc_WindowsError, + ierr, name); Py_XDECREF(name); return result; } #endif /* MS_WINDOWS */ -PyObject * -PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, - PyObject *name, PyObject *path) -{ - PyThreadState *tstate = _PyThreadState_GET(); - int issubclass; - PyObject *kwargs, *error; - - issubclass = PyObject_IsSubclass(exception, PyExc_ImportError); - if (issubclass < 0) { - return NULL; - } - else if (!issubclass) { - _PyErr_SetString(tstate, PyExc_TypeError, - "expected a subclass of ImportError"); - return NULL; - } - - if (msg == NULL) { - _PyErr_SetString(tstate, PyExc_TypeError, - "expected a message argument"); - return NULL; - } - - if (name == NULL) { - name = Py_None; - } - if (path == NULL) { - path = Py_None; - } - - kwargs = PyDict_New(); - if (kwargs == NULL) { - return NULL; - } - if (PyDict_SetItemString(kwargs, "name", name) < 0) { - goto done; - } - if (PyDict_SetItemString(kwargs, "path", path) < 0) { - goto done; - } - - error = _PyObject_FastCallDict(exception, &msg, 1, kwargs); - if (error != NULL) { - _PyErr_SetObject(tstate, (PyObject *)Py_TYPE(error), error); - Py_DECREF(error); - } - -done: - Py_DECREF(kwargs); - return NULL; -} - -PyObject * -PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path) -{ - return PyErr_SetImportErrorSubclass(PyExc_ImportError, msg, name, path); -} - void _PyErr_BadInternalCall(const char *filename, int lineno) { - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_Format(tstate, PyExc_SystemError, - "%s:%d: bad argument to internal function", - filename, lineno); + PyErr_Format(PyExc_SystemError, + "%s:%d: bad argument to internal function", + filename, lineno); } /* Remove the preprocessor macro for PyErr_BadInternalCall() so that we can @@ -933,107 +545,62 @@ _PyErr_BadInternalCall(const char *filename, int lineno) void PyErr_BadInternalCall(void) { - assert(0 && "bad argument to internal function"); - PyThreadState *tstate = _PyThreadState_GET(); - _PyErr_SetString(tstate, PyExc_SystemError, - "bad argument to internal function"); + PyErr_Format(PyExc_SystemError, + "bad argument to internal function"); } #define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) -static PyObject * -_PyErr_FormatV(PyThreadState *tstate, PyObject *exception, - const char *format, va_list vargs) -{ - PyObject* string; - - /* Issue #23571: PyUnicode_FromFormatV() must not be called with an - exception set, it calls arbitrary Python code like PyObject_Repr() */ - _PyErr_Clear(tstate); - - string = PyUnicode_FromFormatV(format, vargs); - - _PyErr_SetObject(tstate, exception, string); - Py_XDECREF(string); - return NULL; -} - - -PyObject * -PyErr_FormatV(PyObject *exception, const char *format, va_list vargs) -{ - PyThreadState *tstate = _PyThreadState_GET(); - return _PyErr_FormatV(tstate, exception, format, vargs); -} - - -PyObject * -_PyErr_Format(PyThreadState *tstate, PyObject *exception, - const char *format, ...) -{ - va_list vargs; -#ifdef HAVE_STDARG_PROTOTYPES - va_start(vargs, format); -#else - va_start(vargs); -#endif - _PyErr_FormatV(tstate, exception, format, vargs); - va_end(vargs); - return NULL; -} - PyObject * PyErr_Format(PyObject *exception, const char *format, ...) { - PyThreadState *tstate = _PyThreadState_GET(); va_list vargs; + PyObject* string; + #ifdef HAVE_STDARG_PROTOTYPES va_start(vargs, format); #else va_start(vargs); #endif - _PyErr_FormatV(tstate, exception, format, vargs); + + string = PyString_FromFormatV(format, vargs); + PyErr_SetObject(exception, string); + Py_XDECREF(string); va_end(vargs); return NULL; } + PyObject * -PyErr_NewException(const char *name, PyObject *base, PyObject *dict) +PyErr_NewException(char *name, PyObject *base, PyObject *dict) { - PyThreadState *tstate = _PyThreadState_GET(); - _Py_IDENTIFIER(__module__); + char *dot; PyObject *modulename = NULL; PyObject *classname = NULL; PyObject *mydict = NULL; PyObject *bases = NULL; PyObject *result = NULL; - - const char *dot = strrchr(name, '.'); + dot = strrchr(name, '.'); if (dot == NULL) { - _PyErr_SetString(tstate, PyExc_SystemError, - "PyErr_NewException: name must be module.class"); + PyErr_SetString(PyExc_SystemError, + "PyErr_NewException: name must be module.class"); return NULL; } - if (base == NULL) { + if (base == NULL) base = PyExc_Exception; - } if (dict == NULL) { dict = mydict = PyDict_New(); if (dict == NULL) goto failure; } - - if (_PyDict_GetItemIdWithError(dict, &PyId___module__) == NULL) { - if (_PyErr_Occurred(tstate)) { - goto failure; - } - modulename = PyUnicode_FromStringAndSize(name, + if (PyDict_GetItemString(dict, "__module__") == NULL) { + modulename = PyString_FromStringAndSize(name, (Py_ssize_t)(dot-name)); if (modulename == NULL) goto failure; - if (_PyDict_SetItemId(dict, &PyId___module__, modulename) != 0) + if (PyDict_SetItemString(dict, "__module__", modulename) != 0) goto failure; } if (PyTuple_Check(base)) { @@ -1045,7 +612,7 @@ PyErr_NewException(const char *name, PyObject *base, PyObject *dict) if (bases == NULL) goto failure; } - /* Create a real class. */ + /* Create a real new-style class. */ result = PyObject_CallFunction((PyObject *)&PyType_Type, "sOO", dot+1, bases, dict); failure: @@ -1059,8 +626,7 @@ PyErr_NewException(const char *name, PyObject *base, PyObject *dict) /* Create an exception with docstring */ PyObject * -PyErr_NewExceptionWithDoc(const char *name, const char *doc, - PyObject *base, PyObject *dict) +PyErr_NewExceptionWithDoc(char *name, char *doc, PyObject *base, PyObject *dict) { int result; PyObject *ret = NULL; @@ -1075,7 +641,7 @@ PyErr_NewExceptionWithDoc(const char *name, const char *doc, } if (doc != NULL) { - docobj = PyUnicode_FromString(doc); + docobj = PyString_FromString(doc); if (docobj == NULL) goto failure; result = PyDict_SetItemString(dict, "__doc__", docobj); @@ -1091,499 +657,155 @@ PyErr_NewExceptionWithDoc(const char *name, const char *doc, } -PyDoc_STRVAR(UnraisableHookArgs__doc__, -"UnraisableHookArgs\n\ -\n\ -Type used to pass arguments to sys.unraisablehook."); - -static PyTypeObject UnraisableHookArgsType; - -static PyStructSequence_Field UnraisableHookArgs_fields[] = { - {"exc_type", "Exception type"}, - {"exc_value", "Exception value"}, - {"exc_traceback", "Exception traceback"}, - {"err_msg", "Error message"}, - {"object", "Object causing the exception"}, - {0} -}; - -static PyStructSequence_Desc UnraisableHookArgs_desc = { - .name = "UnraisableHookArgs", - .doc = UnraisableHookArgs__doc__, - .fields = UnraisableHookArgs_fields, - .n_in_sequence = 5 -}; - - -PyStatus -_PyErr_Init(void) -{ - if (UnraisableHookArgsType.tp_name == NULL) { - if (PyStructSequence_InitType2(&UnraisableHookArgsType, - &UnraisableHookArgs_desc) < 0) { - return _PyStatus_ERR("failed to initialize UnraisableHookArgs type"); - } - } - return _PyStatus_OK(); -} - - -static PyObject * -make_unraisable_hook_args(PyThreadState *tstate, PyObject *exc_type, - PyObject *exc_value, PyObject *exc_tb, - PyObject *err_msg, PyObject *obj) -{ - PyObject *args = PyStructSequence_New(&UnraisableHookArgsType); - if (args == NULL) { - return NULL; - } - - Py_ssize_t pos = 0; -#define ADD_ITEM(exc_type) \ - do { \ - if (exc_type == NULL) { \ - exc_type = Py_None; \ - } \ - Py_INCREF(exc_type); \ - PyStructSequence_SET_ITEM(args, pos++, exc_type); \ - } while (0) - - - ADD_ITEM(exc_type); - ADD_ITEM(exc_value); - ADD_ITEM(exc_tb); - ADD_ITEM(err_msg); - ADD_ITEM(obj); -#undef ADD_ITEM - - if (_PyErr_Occurred(tstate)) { - Py_DECREF(args); - return NULL; - } - return args; -} - - - -/* Default implementation of sys.unraisablehook. - - It can be called to log the exception of a custom sys.unraisablehook. - - Do nothing if sys.stderr attribute doesn't exist or is set to None. */ -static int -write_unraisable_exc_file(PyThreadState *tstate, PyObject *exc_type, - PyObject *exc_value, PyObject *exc_tb, - PyObject *err_msg, PyObject *obj, PyObject *file) +/* Call when an exception has occurred but there is no way for Python + to handle it. Examples: exception in __del__ or during GC. */ +void +PyErr_WriteUnraisable(PyObject *obj) { - if (obj != NULL && obj != Py_None) { - if (err_msg != NULL && err_msg != Py_None) { - if (PyFile_WriteObject(err_msg, file, Py_PRINT_RAW) < 0) { - return -1; + PyObject *f, *t, *v, *tb; + PyErr_Fetch(&t, &v, &tb); + f = PySys_GetObject("stderr"); + if (f != NULL) { + PyFile_WriteString("Exception ", f); + if (t) { + PyObject* moduleName; + char* className; + assert(PyExceptionClass_Check(t)); + className = PyExceptionClass_Name(t); + if (className != NULL) { + char *dot = strrchr(className, '.'); + if (dot != NULL) + className = dot+1; } - if (PyFile_WriteString(": ", file) < 0) { - return -1; - } - } - else { - if (PyFile_WriteString("Exception ignored in: ", file) < 0) { - return -1; - } - } - - if (PyFile_WriteObject(obj, file, 0) < 0) { - _PyErr_Clear(tstate); - if (PyFile_WriteString("<object repr() failed>", file) < 0) { - return -1; - } - } - if (PyFile_WriteString("\n", file) < 0) { - return -1; - } - } - else if (err_msg != NULL && err_msg != Py_None) { - if (PyFile_WriteObject(err_msg, file, Py_PRINT_RAW) < 0) { - return -1; - } - if (PyFile_WriteString(":\n", file) < 0) { - return -1; - } - } - if (exc_tb != NULL && exc_tb != Py_None) { - if (PyTraceBack_Print(exc_tb, file) < 0) { - /* continue even if writing the traceback failed */ - _PyErr_Clear(tstate); - } - } - - if (exc_type == NULL || exc_type == Py_None) { - return -1; - } - - assert(PyExceptionClass_Check(exc_type)); - const char *className = PyExceptionClass_Name(exc_type); - if (className != NULL) { - const char *dot = strrchr(className, '.'); - if (dot != NULL) { - className = dot+1; - } - } - - _Py_IDENTIFIER(__module__); - PyObject *moduleName = _PyObject_GetAttrId(exc_type, &PyId___module__); - if (moduleName == NULL || !PyUnicode_Check(moduleName)) { - Py_XDECREF(moduleName); - _PyErr_Clear(tstate); - if (PyFile_WriteString("<unknown>", file) < 0) { - return -1; - } - } - else { - if (!_PyUnicode_EqualToASCIIId(moduleName, &PyId_builtins)) { - if (PyFile_WriteObject(moduleName, file, Py_PRINT_RAW) < 0) { - Py_DECREF(moduleName); - return -1; - } - Py_DECREF(moduleName); - if (PyFile_WriteString(".", file) < 0) { - return -1; - } - } - else { - Py_DECREF(moduleName); - } - } - if (className == NULL) { - if (PyFile_WriteString("<unknown>", file) < 0) { - return -1; - } - } - else { - if (PyFile_WriteString(className, file) < 0) { - return -1; - } - } - - if (exc_value && exc_value != Py_None) { - if (PyFile_WriteString(": ", file) < 0) { - return -1; - } - if (PyFile_WriteObject(exc_value, file, Py_PRINT_RAW) < 0) { - _PyErr_Clear(tstate); - if (PyFile_WriteString("<exception str() failed>", file) < 0) { - return -1; + moduleName = PyObject_GetAttrString(t, "__module__"); + if (moduleName == NULL) + PyFile_WriteString("<unknown>", f); + else { + char* modstr = PyString_AsString(moduleName); + if (modstr && + strcmp(modstr, "exceptions") != 0) + { + PyFile_WriteString(modstr, f); + PyFile_WriteString(".", f); + } } - } - } - - if (PyFile_WriteString("\n", file) < 0) { - return -1; - } - - /* Explicitly call file.flush() */ - PyObject *res = _PyObject_CallMethodIdNoArgs(file, &PyId_flush); - if (!res) { - return -1; - } - Py_DECREF(res); - - return 0; -} - - -static int -write_unraisable_exc(PyThreadState *tstate, PyObject *exc_type, - PyObject *exc_value, PyObject *exc_tb, PyObject *err_msg, - PyObject *obj) -{ - PyObject *file = _PySys_GetObjectId(&PyId_stderr); - if (file == NULL || file == Py_None) { - return 0; - } - - /* Hold a strong reference to ensure that sys.stderr doesn't go away - while we use it */ - Py_INCREF(file); - int res = write_unraisable_exc_file(tstate, exc_type, exc_value, exc_tb, - err_msg, obj, file); - Py_DECREF(file); - - return res; -} - - -PyObject* -_PyErr_WriteUnraisableDefaultHook(PyObject *args) -{ - PyThreadState *tstate = _PyThreadState_GET(); - - if (Py_TYPE(args) != &UnraisableHookArgsType) { - _PyErr_SetString(tstate, PyExc_TypeError, - "sys.unraisablehook argument type " - "must be UnraisableHookArgs"); - return NULL; - } - - /* Borrowed references */ - PyObject *exc_type = PyStructSequence_GET_ITEM(args, 0); - PyObject *exc_value = PyStructSequence_GET_ITEM(args, 1); - PyObject *exc_tb = PyStructSequence_GET_ITEM(args, 2); - PyObject *err_msg = PyStructSequence_GET_ITEM(args, 3); - PyObject *obj = PyStructSequence_GET_ITEM(args, 4); - - if (write_unraisable_exc(tstate, exc_type, exc_value, exc_tb, err_msg, obj) < 0) { - return NULL; - } - Py_RETURN_NONE; -} - - -/* Call sys.unraisablehook(). - - This function can be used when an exception has occurred but there is no way - for Python to handle it. For example, when a destructor raises an exception - or during garbage collection (gc.collect()). - - If err_msg_str is non-NULL, the error message is formatted as: - "Exception ignored %s" % err_msg_str. Otherwise, use "Exception ignored in" - error message. - - An exception must be set when calling this function. */ -void -_PyErr_WriteUnraisableMsg(const char *err_msg_str, PyObject *obj) -{ - PyThreadState *tstate = _PyThreadState_GET(); - assert(tstate != NULL); - - PyObject *err_msg = NULL; - PyObject *exc_type, *exc_value, *exc_tb; - _PyErr_Fetch(tstate, &exc_type, &exc_value, &exc_tb); - - assert(exc_type != NULL); - - if (exc_type == NULL) { - /* sys.unraisablehook requires that at least exc_type is set */ - goto default_hook; - } - - if (exc_tb == NULL) { - struct _frame *frame = tstate->frame; - if (frame != NULL) { - exc_tb = _PyTraceBack_FromFrame(NULL, frame); - if (exc_tb == NULL) { - _PyErr_Clear(tstate); + if (className == NULL) + PyFile_WriteString("<unknown>", f); + else + PyFile_WriteString(className, f); + if (v && v != Py_None) { + PyFile_WriteString(": ", f); + if (PyFile_WriteObject(v, f, 0) < 0) { + PyErr_Clear(); + PyFile_WriteString("<exception repr() failed>", f); + } } + Py_XDECREF(moduleName); } - } - - _PyErr_NormalizeException(tstate, &exc_type, &exc_value, &exc_tb); - - if (exc_tb != NULL && exc_tb != Py_None && PyTraceBack_Check(exc_tb)) { - if (PyException_SetTraceback(exc_value, exc_tb) < 0) { - _PyErr_Clear(tstate); - } - } - - if (err_msg_str != NULL) { - err_msg = PyUnicode_FromFormat("Exception ignored %s", err_msg_str); - if (err_msg == NULL) { + PyFile_WriteString(" in ", f); + if (PyFile_WriteObject(obj, f, 0) < 0) { PyErr_Clear(); + PyFile_WriteString("<object repr() failed>", f); } + PyFile_WriteString(" ignored\n", f); + PyErr_Clear(); /* Just in case */ } - - PyObject *hook_args = make_unraisable_hook_args( - tstate, exc_type, exc_value, exc_tb, err_msg, obj); - if (hook_args == NULL) { - err_msg_str = ("Exception ignored on building " - "sys.unraisablehook arguments"); - goto error; - } - - _Py_IDENTIFIER(unraisablehook); - PyObject *hook = _PySys_GetObjectId(&PyId_unraisablehook); - if (hook == NULL) { - Py_DECREF(hook_args); - goto default_hook; - } - - if (PySys_Audit("sys.unraisablehook", "OO", hook, hook_args) < 0) { - Py_DECREF(hook_args); - err_msg_str = "Exception ignored in audit hook"; - obj = NULL; - goto error; - } - - if (hook == Py_None) { - Py_DECREF(hook_args); - goto default_hook; - } - - PyObject *res = _PyObject_CallOneArg(hook, hook_args); - Py_DECREF(hook_args); - if (res != NULL) { - Py_DECREF(res); - goto done; - } - - /* sys.unraisablehook failed: log its error using default hook */ - obj = hook; - err_msg_str = NULL; - -error: - /* err_msg_str and obj have been updated and we have a new exception */ - Py_XSETREF(err_msg, PyUnicode_FromString(err_msg_str ? - err_msg_str : "Exception ignored in sys.unraisablehook")); - Py_XDECREF(exc_type); - Py_XDECREF(exc_value); - Py_XDECREF(exc_tb); - _PyErr_Fetch(tstate, &exc_type, &exc_value, &exc_tb); - -default_hook: - /* Call the default unraisable hook (ignore failure) */ - (void)write_unraisable_exc(tstate, exc_type, exc_value, exc_tb, - err_msg, obj); - -done: - Py_XDECREF(exc_type); - Py_XDECREF(exc_value); - Py_XDECREF(exc_tb); - Py_XDECREF(err_msg); - _PyErr_Clear(tstate); /* Just in case */ -} - - -void -PyErr_WriteUnraisable(PyObject *obj) -{ - _PyErr_WriteUnraisableMsg(NULL, obj); + Py_XDECREF(t); + Py_XDECREF(v); + Py_XDECREF(tb); } - extern PyObject *PyModule_GetWarningsModule(void); -void -PyErr_SyntaxLocation(const char *filename, int lineno) -{ - PyErr_SyntaxLocationEx(filename, lineno, -1); -} - - /* Set file and line information for the current exception. If the exception is not a SyntaxError, also sets additional attributes to make printing of exceptions believe it is a syntax error. */ void -PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset) +PyErr_SyntaxLocation(const char *filename, int lineno) { PyObject *exc, *v, *tb, *tmp; - _Py_IDENTIFIER(filename); - _Py_IDENTIFIER(lineno); - _Py_IDENTIFIER(msg); - _Py_IDENTIFIER(offset); - _Py_IDENTIFIER(print_file_and_line); - _Py_IDENTIFIER(text); - PyThreadState *tstate = _PyThreadState_GET(); /* add attributes for the line number and filename for the error */ - _PyErr_Fetch(tstate, &exc, &v, &tb); - _PyErr_NormalizeException(tstate, &exc, &v, &tb); + PyErr_Fetch(&exc, &v, &tb); + PyErr_NormalizeException(&exc, &v, &tb); /* XXX check that it is, indeed, a syntax error. It might not * be, though. */ - tmp = PyLong_FromLong(lineno); + tmp = PyInt_FromLong(lineno); if (tmp == NULL) - _PyErr_Clear(tstate); + PyErr_Clear(); else { - if (_PyObject_SetAttrId(v, &PyId_lineno, tmp)) { - _PyErr_Clear(tstate); - } + if (PyObject_SetAttrString(v, "lineno", tmp)) + PyErr_Clear(); Py_DECREF(tmp); } - tmp = NULL; - if (col_offset >= 0) { - tmp = PyLong_FromLong(col_offset); - if (tmp == NULL) { - _PyErr_Clear(tstate); - } - } - if (_PyObject_SetAttrId(v, &PyId_offset, tmp ? tmp : Py_None)) { - _PyErr_Clear(tstate); - } - Py_XDECREF(tmp); if (filename != NULL) { - if (_PyObject_SetAttrId(v, &PyId_filename, filename)) { - _PyErr_Clear(tstate); + tmp = PyString_FromString(filename); + if (tmp == NULL) + PyErr_Clear(); + else { + if (PyObject_SetAttrString(v, "filename", tmp)) + PyErr_Clear(); + Py_DECREF(tmp); } - tmp = PyErr_ProgramTextObject(filename, lineno); + tmp = PyErr_ProgramText(filename, lineno); if (tmp) { - if (_PyObject_SetAttrId(v, &PyId_text, tmp)) { - _PyErr_Clear(tstate); - } + if (PyObject_SetAttrString(v, "text", tmp)) + PyErr_Clear(); Py_DECREF(tmp); } } + if (PyObject_SetAttrString(v, "offset", Py_None)) { + PyErr_Clear(); + } if (exc != PyExc_SyntaxError) { - if (!_PyObject_HasAttrId(v, &PyId_msg)) { + if (!PyObject_HasAttrString(v, "msg")) { tmp = PyObject_Str(v); if (tmp) { - if (_PyObject_SetAttrId(v, &PyId_msg, tmp)) { - _PyErr_Clear(tstate); - } + if (PyObject_SetAttrString(v, "msg", tmp)) + PyErr_Clear(); Py_DECREF(tmp); - } - else { - _PyErr_Clear(tstate); + } else { + PyErr_Clear(); } } - if (!_PyObject_HasAttrId(v, &PyId_print_file_and_line)) { - if (_PyObject_SetAttrId(v, &PyId_print_file_and_line, - Py_None)) { - _PyErr_Clear(tstate); - } + if (!PyObject_HasAttrString(v, "print_file_and_line")) { + if (PyObject_SetAttrString(v, "print_file_and_line", + Py_None)) + PyErr_Clear(); } } - _PyErr_Restore(tstate, exc, v, tb); + PyErr_Restore(exc, v, tb); } -void -PyErr_SyntaxLocationEx(const char *filename, int lineno, int col_offset) -{ - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *fileobj; - if (filename != NULL) { - fileobj = PyUnicode_DecodeFSDefault(filename); - if (fileobj == NULL) { - _PyErr_Clear(tstate); - } - } - else { - fileobj = NULL; - } - PyErr_SyntaxLocationObject(fileobj, lineno, col_offset); - Py_XDECREF(fileobj); -} - -/* Attempt to load the line of text that the exception refers to. If it - fails, it will return NULL but will not set an exception. +/* com_fetch_program_text will attempt to load the line of text that + the exception refers to. If it fails, it will return NULL but will + not set an exception. XXX The functionality of this function is quite similar to the - functionality in tb_displayline() in traceback.c. */ + functionality in tb_displayline() in traceback.c. +*/ -static PyObject * -err_programtext(PyThreadState *tstate, FILE *fp, int lineno) +PyObject * +PyErr_ProgramText(const char *filename, int lineno) { + FILE *fp; int i; char linebuf[1000]; + if (filename == NULL || *filename == '\0' || lineno <= 0) + return NULL; + fp = fopen(filename, "r" PY_STDIOTEXTMODE); if (fp == NULL) return NULL; for (i = 0; i < lineno; i++) { char *pLastChar = &linebuf[sizeof(linebuf) - 2]; do { *pLastChar = '\0'; - if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, - fp, NULL) == NULL) + if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, fp, NULL) == NULL) break; /* fgets read *something*; if it didn't get as far as pLastChar, it must have found a newline @@ -1594,43 +816,15 @@ err_programtext(PyThreadState *tstate, FILE *fp, int lineno) } fclose(fp); if (i == lineno) { - PyObject *res; - res = PyUnicode_FromString(linebuf); - if (res == NULL) - _PyErr_Clear(tstate); - return res; + char *p = linebuf; + while (*p == ' ' || *p == '\t' || *p == '\014') + p++; + return PyString_FromString(p); } return NULL; } -PyObject * -PyErr_ProgramText(const char *filename, int lineno) -{ - FILE *fp; - if (filename == NULL || *filename == '\0' || lineno <= 0) { - return NULL; - } - PyThreadState *tstate = _PyThreadState_GET(); - fp = _Py_fopen(filename, "r" PY_STDIOTEXTMODE); - return err_programtext(tstate, fp, lineno); -} - -PyObject * -PyErr_ProgramTextObject(PyObject *filename, int lineno) -{ - if (filename == NULL || lineno <= 0) { - return NULL; - } - - PyThreadState *tstate = _PyThreadState_GET(); - FILE *fp = _Py_fopen_obj(filename, "r" PY_STDIOTEXTMODE); - if (fp == NULL) { - _PyErr_Clear(tstate); - return NULL; - } - return err_programtext(tstate, fp, lineno); -} - #ifdef __cplusplus } #endif + |