Pass exit status (i.e. arguments passed to SystemExit) to shell. Fixes bpython#227.

Trundle · Trundle · commit 4cbc5f5a47ed · 2012-10-08T00:01:36.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -321,6 +321,7 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
         self.list_win = newwin(get_colpair(config, 'background'), 1, 1, 1, 1)
         self.cpos = 0
         self.do_exit = False
+        self.exit_value = None
         self.f_string = ''
         self.idle = idle
         self.in_hist = False
@@ -1066,9 +1067,10 @@ def push(self, s, insert_into_history=True):
         curses.raw(False)
         try:
             return repl.Repl.push(self, s, insert_into_history)
-        except SystemExit:
+        except SystemExit, e:
             # Avoid a traceback on e.g. quit()
             self.do_exit = True
+            self.exit_value = e.args
             return False
         finally:
             curses.raw(True)
@@ -1131,6 +1133,7 @@ def repl(self):
             if not more:
                 self.prev_block_finished = stdout_position
                 self.s = ''
+        return self.exit_value
 
     def reprint_line(self, lineno, tokens):
         """Helper function for paren highlighting: Reprint line at offset
@@ -1821,6 +1824,9 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     I've tried to keep it well factored but it needs some
     tidying up, especially in separating the curses stuff
     from the rest of the repl.
+
+    Returns a tuple (exit value, output), where exit value is a tuple
+    with arguments passed to SystemExit.
     """
     global stdscr
     global DO_RESIZE
@@ -1873,7 +1879,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     if banner is not None:
         clirepl.write(banner)
         clirepl.write('\n')
-    clirepl.repl()
+    exit_value = clirepl.repl()
 
     main_win.erase()
     main_win.refresh()
@@ -1886,7 +1892,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
         signal.signal(signal.SIGWINCH, old_sigwinch_handler)
         signal.signal(signal.SIGCONT, old_sigcont_handler)
 
-    return clirepl.getstdout()
+    return (exit_value, clirepl.getstdout())
 
 
 def main(args=None, locals_=None, banner=None):
@@ -1901,23 +1907,23 @@ def main(args=None, locals_=None, banner=None):
     orig_stderr = sys.stderr
 
     try:
-        o = curses_wrapper(main_curses, exec_args, config,
-                           options.interactive, locals_,
-                           banner=banner)
+        (exit_value, output) = curses_wrapper(
+            main_curses, exec_args, config, options.interactive, locals_,
+            banner=banner)
     finally:
         sys.stdin = orig_stdin
         sys.stderr = orig_stderr
         sys.stdout = orig_stdout
 
     # Fake stdout data so everything's still visible after exiting
     if config.flush_output and not options.quiet:
-        sys.stdout.write(o)
+        sys.stdout.write(output)
     if hasattr(sys.stdout, 'flush'):
         sys.stdout.flush()
-
+    return repl.extract_exit_value(exit_value)
 
 if __name__ == '__main__':
     from bpython.cli import main
-    main()
+    sys.exit(main())
 
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -336,6 +336,7 @@ def __init__(self, interpreter, config):
         gtk.TextView.__init__(self)
         repl.Repl.__init__(self, interpreter, config)
         self.interp.writetb = self.writetb
+        self.exit_value = None
         self.editing = Nested()
         self.reset_indent = False
         self.modify_font(pango.FontDescription(self.config.gtk_font))
@@ -694,7 +695,8 @@ def push_line(self):
         self.highlight_current_line()
         try:
             return self.push(line + '\n')
-        except SystemExit:
+        except SystemExit, e:
+            self.exit_value = e.args
             self.emit('exit-event')
             return False
 
@@ -857,8 +859,8 @@ def main(args=None):
     except KeyboardInterrupt:
         pass
 
-    return 0
+    return repl.extract_exit_value(repl_widget.exit_value)
 
 if __name__ == '__main__':
     from bpython.gtk_ import main
-    main()
+    sys.exit(main())
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1027,3 +1027,14 @@ def token_is_any_of(token):
         return any(check(token) for check in is_token_types)
 
     return token_is_any_of
+
+def extract_exit_value(args):
+    """Given the arguments passed to `SystemExit`, return the value that
+    should be passed to `sys.exit`.
+    """
+    if len(args) == 0:
+        return None
+    elif len(args) == 1:
+        return args[0]
+    else:
+        return args
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -621,6 +621,8 @@ def __init__(self, event_loop, palette, interpreter, config):
         self.current_output = None
         self._completion_update_suppressed = False
 
+        self.exit_value = None
+
         load_urwid_command_map(config)
 
     # Subclasses of Repl need to implement echo, current_line, cw
@@ -913,7 +915,8 @@ def push(self, s, insert_into_history=True):
         # Pretty blindly adapted from bpython.cli
         try:
             return repl.Repl.push(self, s, insert_into_history)
-        except SystemExit:
+        except SystemExit, e:
+            self.exit_value = e.args
             raise urwid.ExitMainLoop()
         except KeyboardInterrupt:
             # KeyboardInterrupt happened between the except block around
@@ -1296,7 +1299,9 @@ def run_find_coroutine():
 
     if config.flush_output and not options.quiet:
         sys.stdout.write(myrepl.getstdout())
-    sys.stdout.flush()
+    if hasattr(sys.stdout, "flush"):
+        sys.stdout.flush()
+    return repl.extract_exit_value(myrepl.exit_value)
 
 def load_urwid_command_map(config):
     urwid.command_map[key_dispatch[config.up_one_line_key]] = 'cursor up'
@@ -1325,4 +1330,4 @@ def load_urwid_command_map(config):
             'yank_from_buffer': 'C-y'},
 """
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
