formatting and tests

thomasballinger · thomasballinger · commit 06b9400565bf · 2014-10-18T02:53:53.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -547,17 +547,15 @@ def process_key_event(self, e):
     def get_last_word(self):
 
         def last_word(line):
-            if not line:
-                return ''
-            return line.split().pop()
+            return line.split().pop() if line else ''
 
         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)
-        
-        self._set_cursor_offset(self.cursor_offset-len(previous_word)+len(word), reset_rl_history=False)
- 
+        line = self.current_line
+        self._set_current_line(line[:len(line)-len(previous_word)] + word,
+                               reset_rl_history=False)
+        self._set_cursor_offset(self.cursor_offset-len(previous_word) + len(word),
+                                reset_rl_history=False)
 
     def incremental_search(self, reverse=False, include_current=False):
         if self.special_mode == None:
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -40,6 +40,11 @@ def assert_paint_ignoring_formatting(self, screen, cursor_row_col=None):
         if cursor_row_col is not None:
             self.assertEqual(cursor_pos, cursor_row_col)
 
+class TestCurtsiesPaintingTest(TestCurtsiesPainting):
+
+    def test_history_is_cleared(self):
+        self.assertEqual(self.repl.rl_history.entries, [''])
+
 class TestCurtsiesPaintingSimple(TestCurtsiesPainting):
 
     def test_startup(self):
