bpython
diff --git a/‎bpython/curtsies.py‎
Lines changed: 2 additions & 1 deletion b/‎bpython/curtsies.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎bpython/test/test_args.py‎
Lines changed: 17 additions & 0 deletions b/‎bpython/test/test_args.py‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎bpython/test/test_curtsies_painting.py‎
Lines changed: 0 additions & 1 deletion b/‎bpython/test/test_curtsies_painting.py‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎bpython/test/test_curtsies_repl.py‎
Lines changed: 58 additions & 8 deletions b/‎bpython/test/test_curtsies_repl.py‎
Lines changed: 58 additions & 8 deletions
@@ -45,7 +45,8 @@ def main(args=None, locals_=None, banner=None):
     interp = None
     paste = None
     if exec_args:
-        assert options, "don't pass in exec_args without options"
+        if not options:
+            raise ValueError("don't pass in exec_args without options")
         exit_value = 0
         if options.type:
             paste = curtsies.events.PasteEvent()
 
@@ -0,0 +1,17 @@
+import os
+import sys
+import unittest
+from mock import Mock, MagicMock
+try:
+    from unittest import skip
+except ImportError:
+    def skip(f):
+        return lambda self: None
+
+from bpython import config, repl, cli, autocomplete
+
+class TestFutureImports(unittest.TestCase):
+
+    def test_interactive(self):
+        pass
+
@@ -18,7 +18,6 @@ def setup_config():
 
 class TestCurtsiesPainting(FormatStringTest):
     def setUp(self):
-        self.refresh_requests = []
         self.repl = Repl(config=setup_config())
         self.repl.rl_history = History() # clear history
         self.repl.height, self.repl.width = (5, 10)
 
@@ -1,10 +1,22 @@
-import unittest
-import sys
+import code
 import os
+import sys
+import tempfile
+from contextlib import contextmanager
+from StringIO import StringIO
+
+import unittest
+try:
+    from unittest import skip
+except ImportError:
+    def skip(f):
+        return lambda self: None
+
 py3 = (sys.version_info[0] == 3)
 
-from bpython.curtsiesfrontend import repl
+from bpython.curtsiesfrontend import repl as curtsiesrepl
 from bpython import config
+from bpython import args
 
 def setup_config(conf):
     config_struct = config.Struct()
@@ -18,11 +30,7 @@ def setup_config(conf):
 class TestCurtsiesRepl(unittest.TestCase):
 
     def setUp(self):
-        self.config = setup_config({'editor':'true'})
-        self.repl = repl.Repl(config=self.config)
-        os.environ['PAGER'] = 'true'
-        self.repl.width = 50
-        self.repl.height = 20
+        self.repl = create_repl()
 
     def test_buffer_finished_will_parse(self):
         self.repl.buffer = ['1 + 1']
@@ -43,6 +51,48 @@ def test_external_communication(self):
         self.repl.send_current_block_to_external_editor()
         self.repl.send_session_to_external_editor()
 
+@contextmanager # from http://stackoverflow.com/a/17981937/398212 - thanks @rkennedy
+def captured_output():
+    new_out, new_err = StringIO(), StringIO()
+    old_out, old_err = sys.stdout, sys.stderr
+    try:
+        sys.stdout, sys.stderr = new_out, new_err
+        yield sys.stdout, sys.stderr
+    finally:
+        sys.stdout, sys.stderr = old_out, old_err
+
+def create_repl(**kwargs):
+    config = setup_config({'editor':'true'})
+    repl = curtsiesrepl.Repl(config=config, **kwargs)
+    os.environ['PAGER'] = 'true'
+    repl.width = 50
+    repl.height = 20
+    return repl
+
+class TestFutureImports(unittest.TestCase):
+
+    def test_repl(self):
+        repl = create_repl()
+        with captured_output() as (out, err):
+            repl.push('from __future__ import division')
+            repl.push('1 / 2')
+        self.assertEqual(out.getvalue(), '0.5\n')
+
+    @skip('Failing - this is issue #369')
+    def test_interactive(self):
+        interp = code.InteractiveInterpreter(locals={})
+        with captured_output() as (out, err):
+            with tempfile.NamedTemporaryFile(suffix='.py') as f:
+                f.write('from __future__ import division\n')
+                f.write('print 1/2\n')
+                f.flush()
+                args.exec_code(interp, [f.name])
+
+            repl = create_repl(interp=interp)
+            repl.push('1 / 2')
+
+        self.assertEqual(out.getvalue(), '0.5\n0.5\n')
+
 
 if __name__ == '__main__':
     unittest.main()