Revert my change on initsite(): don't change import site error handler in 3.1,
as I did for 2.6. But fix the other bugs :-)
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f4f8766..55b9d50 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -712,12 +712,22 @@
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);