Merge in main branch

ikanobori · ikanobori · commit 3d9dee86b88e · 2010-04-07T15:47:21.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -88,10 +88,7 @@ def parse(args, extras=None):
         raise SystemExit
 
     if not (sys.stdin.isatty() and sys.stdout.isatty()):
-        interpreter = code.InteractiveInterpreter()
-        interpreter.runsource(sys.stdin.read())
-        raise SystemExit
-
+        run_stdin(sys.stdin)
     path = os.path.expanduser('~/.bpythonrc')
     # migrating old configuration file
     if os.path.isfile(path):
@@ -113,3 +110,11 @@ 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,6 +50,14 @@
 _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):
     """
