mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert my change on initsite(): don't change import site error handler in 3.1,

Browse source 
as I did for 2.6. But fix the other bugs :-)
This commit is contained in:
Victor Stinner 2010-03-21 21:57:42 +00:00
parent ffbc2f63e1
commit 1d6af707cf
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Python/pythonrun.c
View file

@ -712,12 +712,22 @@ initmain(void)
static void
initsite(void)
{
PyObject *m;
PyObject *m, *f;
m = PyImport_ImportModule("site");
if (m == NULL) {
PyErr_Print();
Py_Finalize();
exit(1);
f = PySys_GetObject("stderr");
if (f == NULL || f == Py_None)
return;
if (Py_VerboseFlag) {
PyFile_WriteString(
"'import site' failed; traceback:\n", f);
PyErr_Print();
}
else {
PyFile_WriteString(
"'import site' failed; use -v for traceback\n", f);
PyErr_Clear();
}
}
else {
Py_DECREF(m);