From 3aa6cea86141efd02a015dd510823837d456ebc3 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 23 Oct 2010 08:50:36 +0000
Subject: Issue #10077: Fix logging of site module errors at startup.

---
 Python/pythonrun.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Python/pythonrun.c')

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 {
-- 
cgit v1.2.1