Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r90590:7b4c85cdb7e4
Date: 2017-03-08 15:07 +0100
http://bitbucket.org/pypy/pypy/changeset/7b4c85cdb7e4/
Log: Import 'faulthandler' after we initialize 'sys.stderr', e.g. in case
'-v' is given
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -534,14 +534,6 @@
sys._xoptions = dict(x.split('=', 1) if '=' in x else (x, True)
for x in options['_xoptions'])
- if 'faulthandler' in sys.builtin_module_names:
- if 'faulthandler' in sys._xoptions or os.getenv('PYTHONFAULTHANDLER'):
- import faulthandler
- try:
- faulthandler.enable(2) # manually set to stderr
- except ValueError:
- pass # ignore "2 is not a valid file descriptor"
-
## if not we_are_translated():
## for key in sorted(options):
## print '%40s: %s' % (key, options[key])
@@ -578,6 +570,14 @@
io_encoding = os.getenv("PYTHONIOENCODING") if readenv else None
initstdio(io_encoding, unbuffered)
+ if 'faulthandler' in sys.builtin_module_names:
+ if 'faulthandler' in sys._xoptions or os.getenv('PYTHONFAULTHANDLER'):
+ import faulthandler
+ try:
+ faulthandler.enable(2) # manually set to stderr
+ except ValueError:
+ pass # ignore "2 is not a valid file descriptor"
+
if we_are_translated():
import __pypy__
__pypy__.save_module_content_for_future_reload(sys)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
