static int
_Py_FatalError_PrintExc(PyThreadState *tstate)
{
- PyObject *ferr, *res;
- PyObject *exception, *v, *tb;
- int has_tb;
-
- _PyErr_Fetch(tstate, &exception, &v, &tb);
- if (exception == NULL) {
+ PyObject *exc = _PyErr_GetRaisedException(tstate);
+ if (exc == NULL) {
/* No current exception */
return 0;
}
- ferr = _PySys_GetAttr(tstate, &_Py_ID(stderr));
+ PyObject *ferr = _PySys_GetAttr(tstate, &_Py_ID(stderr));
if (ferr == NULL || ferr == Py_None) {
/* sys.stderr is not set yet or set to None,
no need to try to display the exception */
return 0;
}
- _PyErr_NormalizeException(tstate, &exception, &v, &tb);
- if (tb == NULL) {
- tb = Py_NewRef(Py_None);
- }
- PyException_SetTraceback(v, tb);
- if (exception == NULL) {
- /* PyErr_NormalizeException() failed */
- return 0;
- }
+ PyErr_DisplayException(exc);
- has_tb = (tb != Py_None);
- PyErr_Display(exception, v, tb);
- Py_XDECREF(exception);
- Py_XDECREF(v);
+ PyObject *tb = PyException_GetTraceback(exc);
+ int has_tb = (tb != NULL) && (tb != Py_None);
Py_XDECREF(tb);
+ Py_XDECREF(exc);
/* sys.stderr may be buffered: call sys.stderr.flush() */
- res = PyObject_CallMethodNoArgs(ferr, &_Py_ID(flush));
+ PyObject *res = PyObject_CallMethodNoArgs(ferr, &_Py_ID(flush));
if (res == NULL) {
_PyErr_Clear(tstate);
}
static void
_PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars)
{
- PyObject *exception, *v, *tb, *hook;
-
+ PyObject *typ = NULL, *tb = NULL;
handle_system_exit();
- _PyErr_Fetch(tstate, &exception, &v, &tb);
- if (exception == NULL) {
+ PyObject *exc = _PyErr_GetRaisedException(tstate);
+ if (exc == NULL) {
goto done;
}
-
- _PyErr_NormalizeException(tstate, &exception, &v, &tb);
+ assert(PyExceptionInstance_Check(exc));
+ typ = Py_NewRef(Py_TYPE(exc));
+ tb = PyException_GetTraceback(exc);
if (tb == NULL) {
tb = Py_NewRef(Py_None);
}
- PyException_SetTraceback(v, tb);
- if (exception == NULL) {
- goto done;
- }
- /* Now we know v != NULL too */
if (set_sys_last_vars) {
- if (_PySys_SetAttr(&_Py_ID(last_type), exception) < 0) {
+ if (_PySys_SetAttr(&_Py_ID(last_type), typ) < 0) {
_PyErr_Clear(tstate);
}
- if (_PySys_SetAttr(&_Py_ID(last_value), v) < 0) {
+ if (_PySys_SetAttr(&_Py_ID(last_value), exc) < 0) {
_PyErr_Clear(tstate);
}
if (_PySys_SetAttr(&_Py_ID(last_traceback), tb) < 0) {
_PyErr_Clear(tstate);
}
}
- hook = _PySys_GetAttr(tstate, &_Py_ID(excepthook));
+ PyObject *hook = _PySys_GetAttr(tstate, &_Py_ID(excepthook));
if (_PySys_Audit(tstate, "sys.excepthook", "OOOO", hook ? hook : Py_None,
- exception, v, tb) < 0) {
+ typ, exc, tb) < 0) {
if (PyErr_ExceptionMatches(PyExc_RuntimeError)) {
PyErr_Clear();
goto done;
}
if (hook) {
PyObject* stack[3];
- PyObject *result;
-
- stack[0] = exception;
- stack[1] = v;
+ stack[0] = typ;
+ stack[1] = exc;
stack[2] = tb;
- result = _PyObject_FastCall(hook, stack, 3);
+ PyObject *result = _PyObject_FastCall(hook, stack, 3);
if (result == NULL) {
handle_system_exit();
- PyObject *exception2, *v2, *tb2;
- _PyErr_Fetch(tstate, &exception2, &v2, &tb2);
- _PyErr_NormalizeException(tstate, &exception2, &v2, &tb2);
- /* It should not be possible for exception2 or v2
- to be NULL. However PyErr_Display() can't
- tolerate NULLs, so just be safe. */
- if (exception2 == NULL) {
- exception2 = Py_NewRef(Py_None);
- }
- if (v2 == NULL) {
- v2 = Py_NewRef(Py_None);
- }
+ PyObject *exc2 = _PyErr_GetRaisedException(tstate);
+ assert(exc2 && PyExceptionInstance_Check(exc2));
fflush(stdout);
PySys_WriteStderr("Error in sys.excepthook:\n");
- PyErr_Display(exception2, v2, tb2);
+ PyErr_DisplayException(exc2);
PySys_WriteStderr("\nOriginal exception was:\n");
- PyErr_Display(exception, v, tb);
- Py_DECREF(exception2);
- Py_DECREF(v2);
- Py_XDECREF(tb2);
+ PyErr_DisplayException(exc);
+ Py_DECREF(exc2);
+ }
+ else {
+ Py_DECREF(result);
}
- Py_XDECREF(result);
}
else {
PySys_WriteStderr("sys.excepthook is missing\n");
- PyErr_Display(exception, v, tb);
+ PyErr_DisplayException(exc);
}
done:
- Py_XDECREF(exception);
- Py_XDECREF(v);
+ Py_XDECREF(typ);
+ Py_XDECREF(exc);
Py_XDECREF(tb);
}
#define PyErr_MAX_GROUP_DEPTH 10
void
-_PyErr_Display(PyObject *file, PyObject *exception, PyObject *value, PyObject *tb)
+_PyErr_Display(PyObject *file, PyObject *unused, PyObject *value, PyObject *tb)
{
assert(file != NULL && file != Py_None);
if (PyExceptionInstance_Check(value)
/* Put the traceback on the exception, otherwise it won't get
displayed. See issue #18776. */
PyObject *cur_tb = PyException_GetTraceback(value);
- if (cur_tb == NULL)
+ if (cur_tb == NULL) {
PyException_SetTraceback(value, tb);
- else
+ }
+ else {
Py_DECREF(cur_tb);
+ }
}
struct exception_print_context ctx;
}
void
-PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
+PyErr_Display(PyObject *unused, PyObject *value, PyObject *tb)
{
PyThreadState *tstate = _PyThreadState_GET();
PyObject *file = _PySys_GetAttr(tstate, &_Py_ID(stderr));
return;
}
Py_INCREF(file);
- _PyErr_Display(file, exception, value, tb);
+ _PyErr_Display(file, NULL, value, tb);
Py_DECREF(file);
}
+void _PyErr_DisplayException(PyObject *file, PyObject *exc)
+{
+ _PyErr_Display(file, NULL, exc, NULL);
+}
+
+void PyErr_DisplayException(PyObject *exc)
+{
+ PyErr_Display(NULL, exc, NULL);
+}
+
PyObject *
PyRun_StringFlags(const char *str, int start, PyObject *globals,
PyObject *locals, PyCompilerFlags *flags)
projects / thirdparty / Python / cpython.git / commitdiff
