Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 59865:c2d2e26bcf7f 3.1
Merged revisions 78872 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78872 | victor.stinner | 2010-03-12 15:45:56 +0100 (ven., 12 mars 2010) | 12 lines
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 | Sun, 21 Mar 2010 21:48:45 +0000 |
| parents | 9714f8a77b16 |
| children | f197407bdba2 |
line wrap: on
line diff
--- a/Python/import.c Sun Mar 21 21:44:31 2010 +0000 +++ b/Python/import.c Sun Mar 21 21:48:45 2010 +0000 @@ -2777,8 +2777,6 @@ } else { /* No globals -- use standard builtins, and fake globals */ - PyErr_Clear(); - builtins = PyImport_ImportModuleLevel("builtins", NULL, NULL, NULL, 0); if (builtins == NULL)