Author: Armin Rigo <[email protected]>
Branch: reverse-debugger
Changeset: r94572:2733778b0c3d
Date: 2018-05-14 14:01 +0200
http://bitbucket.org/pypy/pypy/changeset/2733778b0c3d/
Log: Shouldn't catch an exception here, because it remains visible to
user code as the last exception
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
@@ -83,10 +83,7 @@
sys.excepthook(), catching SystemExit, printing a newline after
sys.stdout if needed, etc.
"""
- try:
- from __pypy__ import revdb_stop
- except ImportError:
- revdb_stop = None
+ from __pypy__ import revdb_stop
try:
# run it
try:
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -147,5 +147,6 @@
self.extra_interpdef('jit_backend_features',
'space.wrap(%r)' % features)
if self.space.config.translation.reverse_debugger:
- self.extra_interpdef('revdb_stop',
- 'interp_magic.revdb_stop')
+ self.extra_interpdef('revdb_stop', 'interp_magic.revdb_stop')
+ else:
+ self.extra_interpdef('revdb_stop', 'space.w_None')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
