debugging can be entered and exited in Curtsies

thomasballinger · thomasballinger · commit d357b0f2007d · 2015-04-13T15:55:22.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -20,6 +20,7 @@
 from bpython.curtsiesfrontend import events as bpythonevents
 from bpython import inspection
 from bpython.repl import extract_exit_value
+from bpython.curtsiesfrontend.repl import debugger_hook
 
 logger = logging.getLogger(__name__)
 
@@ -50,6 +51,8 @@ def main(args=None, locals_=None, banner=None):
         logging.getLogger('curtsies').propagate = False
         logging.getLogger('bpython').addHandler(handler)
         logging.getLogger('bpython').propagate = False
+    if options.debugger:
+        sys.excepthook = debugger_hook
 
     interp = None
     paste = None
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -38,6 +38,11 @@
 from bpython._py3compat import py3
 from bpython.pager import get_pager_command
 
+try:
+    from bpython import debugger
+except ImportError as err:
+    debugger = None
+
 from bpython.curtsiesfrontend import replpainter as paint
 from bpython.curtsiesfrontend import sitefix
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
@@ -631,6 +636,8 @@ def process_key_event(self, e):
             self.clear_modules_and_reevaluate()
         elif e in key_dispatch[self.config.toggle_file_watch_key]:
             return self.toggle_file_watch()
+        elif e in key_dispatch[self.config.debug_key]:
+            self.toggle_auto_debug()
         elif e in key_dispatch[self.config.clear_screen_key]:
             self.request_paint_to_clear_screen = True
         elif e in key_dispatch[self.config.show_source_key]:
@@ -871,6 +878,16 @@ def toggle_file_watch(self):
             self.status_bar.message(_('Auto-reloading not available because '
                                       'watchdog not installed.'))
 
+    def toggle_auto_debug(self):
+        if debugger is None:
+            self.status_bar.message(
+                _('No debugger, check your PYTHON_DEBUGGER value.\n'))
+            return
+        if sys.excepthook is not debugger_hook:
+            sys.excepthook = debugger_hook
+        else:
+            sys.excepthook = sys.__excepthook__
+
     # Handler Helpers
     def add_normal_character(self, char):
         if len(char) > 1 or is_nop(char):
@@ -1602,6 +1619,13 @@ def compress_paste_event(paste_event):
         return None
 
 
+def debugger_hook(exc, value, tb):
+    if exc in (SyntaxError, IndentationError, KeyboardInterrupt):
+        sys.__excepthook__(exc, value, tb)
+        return
+    debugger.post_mortem(tb, exc, value)
+
+
 def just_simple_events(event_list):
     simple_events = []
     for e in event_list:
diff --git a/bpython/debugger.py b/bpython/debugger.py
@@ -4,7 +4,7 @@
 
 """
 Debugger factory. Set PYTHON_DEBUGGER to a module path that has a post_mortem
-function in it. Defaults to pdb. This allows alternate debuggers to be used,
+function in it. Defaults to bpdb. This allows alternate debuggers to be used,
 such as pycopia.debugger. :)
 """
 from __future__ import absolute_import
