fix #366 and fix #367

thomasballinger · thomasballinger · commit aea557af6f26 · 2014-08-29T09:28:10.000-07:00
adds tests for and fixes external communication, and
turns off welcome banner if help key is disabled
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -238,7 +238,10 @@ def __init__(self,
         if interp is None:
             interp = code.InteractiveInterpreter(locals=locals_)
         if banner is None:
-            banner = _('Welcome to bpython! Press <%s> for help.') % config.help_key
+            if config.help_key:
+                banner = _('Welcome to bpython!') + ' ' + (_('Press <%s> for help.') % config.help_key)
+            else:
+                banner = None
         config.autocomplete_mode = autocomplete.SIMPLE # only one implemented currently
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
             config.cli_suggestion_width = 1
@@ -1261,7 +1264,7 @@ def show_source(self):
             self.pager(source)
 
     def help_text(self):
-        return self.version_help_text() + '\n' + self.key_help_text()
+        return (self.version_help_text() + '\n' + self.key_help_text()).encode('utf8')
 
     def version_help_text(self):
         return (('bpython-curtsies version %s' % bpython.__version__) + ' ' +
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -38,8 +38,8 @@ def test_startup(self):
 
     def test_enter_text(self):
         [self.repl.add_normal_character(c) for c in '1 + 1']
-        screen = fsarray([cyan('>>> ') + bold(blue('1')+cyan(' ')+
-                          yellow('+') + cyan(' ') + green('1')), cyan('welcome')])
+        screen = fsarray([cyan('>>> ') + bold(green('1')+cyan(' ')+
+                          yellow('+') + cyan(' ') + green('1')), cyan('Welcome to')])
         self.assert_paint(screen, (0, 9))
 
     def test_run_line(self):
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -1,13 +1,28 @@
 import unittest
 import sys
+import os
 py3 = (sys.version_info[0] == 3)
 
 from bpython.curtsiesfrontend import repl
+from bpython import config
+
+def setup_config(conf):
+    config_struct = config.Struct()
+    config.loadini(config_struct, os.devnull)
+    for key, value in conf.items():
+        if not hasattr(config_struct, key):
+            raise ValueError("%r is not a valid config attribute", (key,))
+        setattr(config_struct, key, value)
+    return config_struct
 
 class TestCurtsiesRepl(unittest.TestCase):
 
     def setUp(self):
-        self.repl = repl.Repl()
+        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
 
     def test_buffer_finished_will_parse(self):
         self.repl.buffer = ['1 + 1']
@@ -23,5 +38,11 @@ def test_buffer_finished_will_parse(self):
         self.repl.buffer = ['def foo(x):', '    return 1', '']
         self.assertTrue(self.repl.buffer_finished_will_parse(), (True, True))
 
+    def test_external_communication(self):
+        self.assertEqual(type(self.repl.help_text()), type(b''))
+        self.repl.send_current_block_to_external_editor()
+        self.repl.send_session_to_external_editor()
+
+
 if __name__ == '__main__':
     unittest.main()
