Mercurial > cpython-lru_cache-weakref

comparison 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
comparison
equal deleted inserted replaced
65595:06dfaeb58bde 65602:902f577e7f94
719 if (m == NULL) { 719 if (m == NULL) {
720 f = PySys_GetObject("stderr"); 720 f = PySys_GetObject("stderr");
721 if (f == NULL || f == Py_None) 721 if (f == NULL || f == Py_None)
722 return; 722 return;
723 if (Py_VerboseFlag) { 723 if (Py_VerboseFlag) {
724 PyObject *type, *value, *traceback;
725 PyErr_Fetch(&type, &value, &traceback);
724 PyFile_WriteString( 726 PyFile_WriteString(
725 "'import site' failed; traceback:\n", f); 727 "'import site' failed; traceback:\n", f);
728 PyErr_Restore(type, value, traceback);
726 PyErr_Print(); 729 PyErr_Print();
727 } 730 }
728 else { 731 else {
732 PyErr_Clear();
729 PyFile_WriteString( 733 PyFile_WriteString(
730 "'import site' failed; use -v for traceback\n", f); 734 "'import site' failed; use -v for traceback\n", f);
731 PyErr_Clear();
732 } 735 }
733 } 736 }
734 else { 737 else {
735 Py_DECREF(m); 738 Py_DECREF(m);
736 } 739 }