diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pythonrun.c | 16 | 
1 files changed, 9 insertions, 7 deletions
| diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8b1e61a1c9..784558c119 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -299,19 +299,21 @@ Py_InitializeEx(int install_sigs)      if (install_sigs)          initsigs(); /* Signal handling stuff, including initintr() */ +    initmain(); /* Module __main__ */ +    if (initstdio() < 0) +        Py_FatalError( +            "Py_Initialize: can't initialize sys standard streams"); +      /* Initialize warnings. */      if (PySys_HasWarnOptions()) {          PyObject *warnings_module = PyImport_ImportModule("warnings"); -        if (!warnings_module) -            PyErr_Clear(); +        if (warnings_module == NULL) { +            fprintf(stderr, "'import warnings' failed; traceback:\n"); +            PyErr_Print(); +        }          Py_XDECREF(warnings_module);      } -    initmain(); /* Module __main__ */ -    if (initstdio() < 0) -        Py_FatalError( -            "Py_Initialize: can't initialize sys standard streams"); -      if (!Py_NoSiteFlag)          initsite(); /* Module site */  } | 
