From 3aa6cea86141efd02a015dd510823837d456ebc3 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 23 Oct 2010 08:50:36 +0000 Subject: [PATCH] Issue #10077: Fix logging of site module errors at startup. --- Misc/NEWS | 2 ++ Python/pythonrun.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 9797b91e8b..e2c424c25d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ What's New in Python 3.1.3? Core and Builtins ----------------- +- Issue #10077: Fix logging of site module errors at startup. + - Issue #9713, #10114: Parser functions (eg. PyParser_ASTFromFile) expects filenames encoded to the filesystem encoding with surrogateescape error handler (to support undecodable bytes), instead of UTF-8 in strict mode. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index d08d0edd13..98cad37799 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -721,14 +721,17 @@ initsite(void) if (f == NULL || f == Py_None) return; if (Py_VerboseFlag) { + PyObject *type, *value, *traceback; + PyErr_Fetch(&type, &value, &traceback); PyFile_WriteString( "'import site' failed; traceback:\n", f); + PyErr_Restore(type, value, traceback); PyErr_Print(); } else { + PyErr_Clear(); PyFile_WriteString( "'import site' failed; use -v for traceback\n", f); - PyErr_Clear(); } } else { -- 2.40.0