Make C-d and exit() work in bpython-gtk.

Trundle · Trundle · commit 29d2a17a7354 · 2010-01-04T17:08:13.000+01:00
This closes issue bpython#81.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -896,6 +896,10 @@ def push(self, s, insert_into_history=True):
         curses.raw(False)
         try:
             return Repl.push(self, s, insert_into_history)
+        except SystemExit:
+            # Avoid a traceback on e.g. quit()
+            self.do_exit = True
+            return False
         finally:
             curses.raw(True)
 
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -251,7 +251,8 @@ class ReplWidget(gtk.TextView, repl.Repl):
     __gsignals__ = dict(button_press_event=None,
                         focus_in_event=None,
                         focus_out_event=None,
-                        realize=None)
+                        realize=None,
+                        exit_event=(gobject.SIGNAL_RUN_LAST, None, ()))
 
     def __init__(self, interpreter, config):
         gtk.TextView.__init__(self)
@@ -445,6 +446,9 @@ def do_key_press_event(self, event):
                 self.list_win_visible):
                 self.list_win.back()
                 return True
+        elif state & gtk.gdk.CONTROL_MASK and event.string == chr(4):
+            self.emit('exit-event')
+            return True
         return gtk.TextView.do_key_press_event(self, event)
 
     def do_realize(self):
@@ -575,7 +579,11 @@ def push_line(self):
             self.text_buffer.insert(iter_, '\n')
         self.move_cursor(1)
         self.highlight_current_line()
-        return self.push(line + '\n')
+        try:
+            return self.push(line + '\n')
+        except SystemExit:
+            self.emit('exit-event')
+            return False
 
     def reprint_line(self, lineno, tokens):
         """
@@ -632,6 +640,7 @@ def main(args=None):
 
     interpreter = repl.Interpreter(None, getpreferredencoding())
     repl_widget = ReplWidget(interpreter, config)
+    repl_widget.connect('exit-event', gtk.main_quit)
 
     gobject.idle_add(init_import_completion)
 
@@ -673,7 +682,15 @@ def main(args=None):
     parent.show_all()
     parent.connect('delete-event', lambda widget, event: gtk.main_quit())
 
-    gtk.main()
+    try:
+        gtk.main()
+    except KeyboardInterrupt:
+        pass
+    finally:
+        if config.hist_length:
+            histfilename = os.path.expanduser(config.hist_file)
+            repl_widget.rl_history.save(histfilename, getpreferredencoding())
+    return 0
 
 
 if __name__ == '__main__':
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -650,12 +650,7 @@ def push(self, s, insert_into_history=True):
         if insert_into_history:
             self.rl_history.append(s)
 
-        try:
-            more = self.interp.runsource('\n'.join(self.buffer))
-        except SystemExit:
-            # Avoid a traceback on e.g. quit()
-            self.do_exit = True
-            return False
+        more = self.interp.runsource('\n'.join(self.buffer))
 
         if not more:
             self.buffer = []
