Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 59536:42261c6ca564
Merged revisions 78826 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78826 | victor.stinner | 2010-03-10 23:30:19 +0100 (mer., 10 mars 2010) | 5 lines
Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt
(SIGINT). If an error occurs while importing the site module, the error is
printed and Python exits. Initialize the GIL before importing the site
module.
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 12 Mar 2010 14:45:56 +0000 |
| parents | 58c35495a934 |
| children | f49d24b4456e |
line wrap: on
line diff
--- a/Python/import.c Fri Mar 12 14:31:06 2010 +0000 +++ b/Python/import.c Fri Mar 12 14:45:56 2010 +0000 @@ -2774,8 +2774,6 @@ } else { /* No globals -- use standard builtins, and fake globals */ - PyErr_Clear(); - builtins = PyImport_ImportModuleLevel("builtins", NULL, NULL, NULL, 0); if (builtins == NULL)