Author: Armin Rigo <ar...@tunes.org>
Branch: py3k-faulthandler
Changeset: r87372:07eef320df99
Date: 2016-09-25 19:06 +0200
http://bitbucket.org/pypy/pypy/changeset/07eef320df99/
Log: tweak
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
@@ -521,7 +521,10 @@
if 'faulthandler' in sys.builtin_module_names:
if 'faulthandler' in sys._xoptions or os.getenv('PYTHONFAULTHANDLER'):
import faulthandler
- faulthandler.enable(2) # manually set to stderr
+ 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):
diff --git a/pypy/module/faulthandler/dumper.py
b/pypy/module/faulthandler/dumper.py
--- a/pypy/module/faulthandler/dumper.py
+++ b/pypy/module/faulthandler/dumper.py
@@ -53,7 +53,7 @@
but hopefully close enough). In particular, this is written as
RPython but shouldn't allocate anything.
"""
- _dump("Stack (most recent call first):\n")
+ _dump("Current stack (most recent call first):\n")
s = rvmprof_cintf.get_rvmprof_stack()
depth = 0
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
