fix args parsing

thomasballinger · thomasballinger · commit eb56d06c6304 · 2013-11-06T19:38:28.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scroll.py b/bpython/scroll.py
@@ -1,28 +1,26 @@
 import sys
+from optparse import Option
 
 from fmtstr.terminal import Terminal
 from fmtstr.terminalcontrol import TerminalController
 
 from bpython.scrollfrontend.repl import Repl
-import bpython.args
-
-if '-v' in sys.argv:
-    import logging
-    logging.basicConfig(filename='scroll.log', level=logging.DEBUG)
-    sys.argv.remove('-v')
-
-def cli():
-    config, options, exec_args = bpython.args.parse(args=None)
-    return main(config=config, options=options, exec_args=exec_args)
-
-def main(locals_=None, config=None, exec_args=None, options=None):
-    #TODO this is gross - passing in args and options means you can't
-    # easily have that functionality without running it frmo the command line,
-    # but it makes reusing bpython code easier
+from bpython import args as bpargs
+from bpython.translations import _
+
+def main(args=None, locals_=None, banner=None):
+    config, options, exec_args = bpargs.parse(args, (
+        'scroll options', None, [
+            Option('--log', '-L', action='store_true',
+                help=_("log debug messages to scroll.log")),
+            ]))
+    if options.log:
+        import logging
+        logging.basicConfig(filename='scroll.log', level=logging.DEBUG)
 
     with TerminalController() as tc:
         with Terminal(tc, keep_last_line=True, hide_cursor=False) as term:
-            with Repl(config=config, locals_=locals_, stuff_a_refresh_request=tc.stuff_a_refresh_request) as repl:
+            with Repl(config=config, locals_=locals_, stuff_a_refresh_request=tc.stuff_a_refresh_request, banner=banner) as repl:
                 rows, columns = tc.get_screen_size()
                 repl.width = columns
                 repl.height = rows
@@ -32,9 +30,9 @@ def main(locals_=None, config=None, exec_args=None, options=None):
                     assert options, "don't pass in exec_args without options"
                     try:
                         #TODO replace this so that stdout is properly harvested for display!
-                        bpython.args.exec_code(repl.interp, exec_args)
-                    except SystemExit:
-                        pass
+                        bpargs.exec_code(repl.interp, exec_args)
+                    except SystemExit, e:
+                        exit_value = e.args
                     if not options.interactive:
                         #TODO treat this properly: no prompt should ever display, but stdout should!
                         array, cursor_pos = repl.paint(about_to_exit=True)
@@ -54,4 +52,4 @@ def main(locals_=None, config=None, exec_args=None, options=None):
                         repl.scroll_offset += scrolled
 
 if __name__ == '__main__':
-    sys.exit(cli())
+    sys.exit(main())
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -43,8 +43,7 @@
 #TODO use events instead of length-one queues for interthread communication
 
 #TODO raw_input should be bytes in python2
-#TODO ctlr-c handling at all times
-#TODO nicer passing of control between threads
+
 
 from bpython.keys import cli_key_dispatch as key_dispatch
 
@@ -105,20 +104,23 @@ class Repl(BpythonRepl):
     """
 
     ## initialization, cleanup
-    def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None):
+    def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None, banner=None):
         logging.debug("starting init")
         interp = code.InteractiveInterpreter(locals=locals_)
 
         if config is None:
             config = Struct()
             loadini(config, default_config_path())
 
+        if banner is None:
+            banner = _('welcome to bpython')
+
         config.autocomplete_mode = SIMPLE # only one implemented currently
 
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
             config.cli_suggestion_width = 1
 
-        self.status_bar = StatusBar(_('welcome to bpython'), _(
+        self.status_bar = StatusBar(banner, _(
             " <%s> Rewind  <%s> Save  <%s> Pastebin <%s> Editor"
             ) % (config.undo_key, config.save_key, config.pastebin_key, config.external_editor_key))
         self.rl_char_sequences = get_updated_char_sequences(key_dispatch, config)
@@ -304,10 +306,10 @@ def send_to_stdout(self, output):
         logging.debug('display_lines: %r', self.display_lines)
 
     def send_to_stderr(self, error):
-        self.send_to_stdout(error)
-        #self.display_lines.extend([func_for_letter(self.config.color_scheme['error'])(line)
-        #                           for line in sum([paint.display_linize(line, self.width)
-        #                                            for line in error.split('\n')], [])])
+        #self.send_to_stdout(error)
+        self.display_lines.extend([func_for_letter(self.config.color_scheme['error'])(line)
+                                   for line in sum([paint.display_linize(line, self.width)
+                                                    for line in error.split('\n')], [])])
 
     def send_to_stdin(self, line):
         if line.endswith('\n'):
diff --git a/data/bpython-scroll b/data/bpython-scroll
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 import sys
-from bpython.scroll import cli
+from bpython.scroll import main
 
-sys.exit(cli())
+sys.exit(main())
diff --git a/setup.py b/setup.py
@@ -167,7 +167,7 @@ def initialize_options(self):
         'console_scripts': [
             'bpython = bpython.cli:main',
             'bpython-urwid = bpython.urwid:main',
-            'bpython-scroll = bpython.scroll:cli [scroll]',
+            'bpython-scroll = bpython.scroll:main [scroll]',
         ],
         'gui_scripts': [
             'bpython-gtk = bpython.gtk_:main'
