Rewind ugly monkeypatching fix and pick the simpler solution of an added argument to parse which ignores stdins

ikanobori · ikanobori · commit 016332346859 · 2010-04-07T22:32:58.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -21,7 +21,7 @@ def error(self, msg):
         raise OptionParserFailed()
 
 
-def parse(args, extras=None):
+def parse(args, extras=None, ignore_stdin=False):
     """Receive an argument list - if None, use sys.argv - parse all args and
     take appropriate action. Also receive optional extra options: this should
     be a tuple of (title, description, options)
@@ -87,8 +87,11 @@ def parse(args, extras=None):
                'See AUTHORS for detail.')
         raise SystemExit
 
-    if not (sys.stdin.isatty() and sys.stdout.isatty()):
-        run_stdin(sys.stdin)
+    if not ignore_stdin and not (sys.stdin.isatty() and sys.stdout.isatty()):
+        interpreter = code.InteractiveInterpreter()
+        interpreter.runsource(sys.stdin.read())
+        raise SystemExit
+
     path = os.path.expanduser('~/.bpythonrc')
     # migrating old configuration file
     if os.path.isfile(path):
@@ -110,11 +113,3 @@ def exec_code(interpreter, args):
     sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
     interpreter.runcode(code_obj)
     sys.argv = old_argv
-
-def run_stdin(stdin):
-    """
-    Run code from a file-like object and exit.
-    """
-    interpreter = code.InteractiveInterpreter()
-    interpreter.runsource(stdin.read())
-    raise SystemExit
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -50,15 +50,6 @@
 _COLORS = dict(b='blue', c='cyan', g='green', m='magenta', r='red',
                w='white', y='yellow', k='black', d='black')
 
-def run_stdin(stdin):
-    """
-    Overwrite stdin reader from args as GTK does not supply a stdin/stdout
-    as a tty.
-    """
-    pass
-
-bpython.args.run_stdin = run_stdin
-
 class ArgspecFormatter(object):
     """
     Format an argspec using Pango markup language.
@@ -755,7 +746,8 @@ def main(args=None):
                    "Options specific to bpython's Gtk+ front end",
                    [optparse.Option('--socket-id', dest='socket_id',
                                     type='int', help='Embed bpython')])
-    config, options, exec_args = bpython.args.parse(args, gtk_options)
+    config, options, exec_args = bpython.args.parse(args, gtk_options,
+                                                    True)
 
     interpreter = repl.Interpreter(None, getpreferredencoding())
     repl_widget = ReplWidget(interpreter, config)
