##// END OF EJS Templates
Merge pull request #13668 from telamonian/fix-handling-of-bdbquit...
Matthias Bussonnier -
r27658:1893a8f5 merge
parent child
Show More
@@ -28,5 +28,13 __pycache__
28 .pytest_cache
28 .pytest_cache
29 .python-version
29 .python-version
30 venv*/
30 venv*/
31 .idea/
32 .mypy_cache/
31 .mypy_cache/
32
33 # jetbrains ide stuff
34 *.iml
35 .idea/
36
37 # vscode ide stuff
38 *.code-workspace
39 .history
40 .vscode
@@ -101,7 +101,6 All the changes since then are under the same license as IPython.
101 #
101 #
102 #*****************************************************************************
102 #*****************************************************************************
103
103
104 import bdb
105 import inspect
104 import inspect
106 import linecache
105 import linecache
107 import sys
106 import sys
@@ -14,6 +14,7
14 import abc
14 import abc
15 import ast
15 import ast
16 import atexit
16 import atexit
17 import bdb
17 import builtins as builtin_mod
18 import builtins as builtin_mod
18 import dis
19 import dis
19 import functools
20 import functools
@@ -3403,6 +3404,11 class InteractiveShell(SingletonConfigurable):
3403 result.error_in_exec = e
3404 result.error_in_exec = e
3404 self.showtraceback(exception_only=True)
3405 self.showtraceback(exception_only=True)
3405 warn("To exit: use 'exit', 'quit', or Ctrl-D.", stacklevel=1)
3406 warn("To exit: use 'exit', 'quit', or Ctrl-D.", stacklevel=1)
3407 except bdb.BdbQuit:
3408 etype, value, tb = sys.exc_info()
3409 if result is not None:
3410 result.error_in_exec = value
3411 # the BdbQuit stops here
3406 except self.custom_exceptions:
3412 except self.custom_exceptions:
3407 etype, value, tb = sys.exc_info()
3413 etype, value, tb = sys.exc_info()
3408 if result is not None:
3414 if result is not None:
General Comments 0
You need to be logged in to leave comments. Login now