Mercurial > cpython-lru_cache-weakref

diff Python/pythonrun.c @ 65602:902f577e7f94 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #10077: Fix logging of site module errors at startup.
author Victor Stinner <victor.stinner@haypocalc.com>
date Sat, 23 Oct 2010 08:50:36 +0000
parents 42b84d3188d1
children 53639e57ba40
line wrap: on
line diff
--- a/Python/pythonrun.c	Fri Oct 22 18:34:13 2010 +0000
+++ b/Python/pythonrun.c	Sat Oct 23 08:50:36 2010 +0000
@@ -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 {