diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:45:56 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-12 14:45:56 +0000 |
| commit | 52f6dd7a3dd9d672a23d7f654a46f126cfc74968 (patch) | |
| tree | 34985c0029101f0a3897d200bc8fdaec754d746a /Lib/site.py | |
| parent | 2743139031017874fba4b8cfe8f6f44c52789bee (diff) | |
| download | cpython-git-52f6dd7a3dd9d672a23d7f654a46f126cfc74968.tar.gz | |
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.
........
Diffstat (limited to 'Lib/site.py')
| -rw-r--r-- | Lib/site.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Lib/site.py b/Lib/site.py index bf4d67f0d2..14fa5703b4 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -489,11 +489,12 @@ def execsitecustomize(): pass except Exception as err: if os.environ.get("PYTHONVERBOSE"): - raise - sys.stderr.write( - "Error in sitecustomize; set PYTHONVERBOSE for traceback:\n" - "%s: %s\n" % - (err.__class__.__name__, err)) + sys.excepthook(*sys.exc_info()) + else: + sys.stderr.write( + "Error in sitecustomize; set PYTHONVERBOSE for traceback:\n" + "%s: %s\n" % + (err.__class__.__name__, err)) def execusercustomize(): @@ -502,6 +503,14 @@ def execusercustomize(): import usercustomize except ImportError: pass + except Exception as err: + if os.environ.get("PYTHONVERBOSE"): + sys.excepthook(*sys.exc_info()) + else: + sys.stderr.write( + "Error in usercustomize; set PYTHONVERBOSE for traceback:\n" + "%s: %s\n" % + (err.__class__.__name__, err)) def main(): |