commit 3aa6cea86141efd02a015dd510823837d456ebc3
author Victor Stinner <victor.stinner@haypocalc.com> Sat Oct 23 08:50:36 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Sat Oct 23 08:50:36 2010 +0000
tree b624f962b5e5b95045ff0796257ccfc9f9443f6e
parent ecdd08462af25573af316e63fdbb1b5e7c6c524a

Issue #10077: Fix logging of site module errors at startup.

Python/pythonrun.c

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index d08d0ed..98cad37 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -721,14 +721,17 @@
         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 {