test last_word, add failing test case that caused crash

thomasballinger · thomasballinger · commit b51663c3e632 · 2015-02-12T22:59:09.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -628,11 +628,8 @@ def process_key_event(self, e):
 
     def get_last_word(self):
 
-        def last_word(line):
-            return line.split().pop() if line else ''
-
-        previous_word = last_word(self.rl_history.entry)
-        word = last_word(self.rl_history.back())
+        previous_word = _last_word(self.rl_history.entry)
+        word = _last_word(self.rl_history.back())
         line = self.current_line
         self._set_current_line(line[:len(line) - len(previous_word)] + word,
                                reset_rl_history=False)
@@ -1522,6 +1519,10 @@ def tabs_to_spaces(line):
     return line.replace('\t', '    ')
 
 
+def _last_word(line):
+    return line.split().pop() if line else ''
+
+
 def compress_paste_event(paste_event):
     """If all events in a paste event are identical and not simple characters,
     returns one of them
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -77,6 +77,12 @@ def test_get_last_word(self):
         self.repl.get_last_word()
         self.assertEqual(self.repl.current_line, 'abcde3')
 
+    def test_last_word(self):
+        self.assertEquals(curtsiesrepl._last_word(''), '')
+        self.assertEquals(curtsiesrepl._last_word(' '), '')
+        self.assertEquals(curtsiesrepl._last_word('a'), 'a')
+        self.assertEquals(curtsiesrepl._last_word('a b'), 'b')
+
     # this is the behavior of bash - not currently implemented
     @unittest.skip
     def test_get_last_word_with_prev_line(self):
