exit immediately on exit key

thomasballinger · thomasballinger · commit fdf30d4c8f1f · 2014-07-27T11:45:03.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -394,9 +394,11 @@ def process_event(self, e):
                     self.focus_on_subprocess(['less', '-R', tmp.name])
         elif e in key_dispatch[self.config.suspend_key]:
             raise SystemExit()
-        elif e in ("<Ctrl-d>",) + key_dispatch[self.config.exit_key]:
+        elif e in ("<Ctrl-d>",):
             if self.current_line == '':
                 raise SystemExit()
+        elif e in key_dispatch[self.config.exit_key]:
+                raise SystemExit()
         elif e in ("\n", "\r", "<PADENTER>", "<Ctrl-j>", "<Ctrl-m>"):
             self.on_enter()
             self.update_completion()
