don't use undo estimate if taking back line of multiline input

thomasballinger · thomasballinger · commit 0811bdd5ed32 · 2015-01-28T20:06:29.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1286,6 +1286,7 @@ def reprint_line(self, lineno, tokens):
             self.display_buffer[lineno] = bpythonparse(format(tokens, self.formatter))
 
     def take_back_buffer_line(self):
+        self.history = self.history[:-1]
         self.display_buffer.pop()
         self.buffer.pop()
 
@@ -1299,10 +1300,16 @@ def take_back_buffer_line(self):
             self.cursor_offset = len(self.current_line)
 
     def prompt_undo(self):
+        if self.buffer:
+            return self.take_back_buffer_line()
+
+        self.reevaluate()
+
         def prompt_for_undo():
             n = BpythonRepl.prompt_undo(self)
             if n > 0:
                 self.request_undo(n=n)
+
         greenlet.greenlet(prompt_for_undo).switch()
 
     def reevaluate(self, insert_into_history=False):
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -868,11 +868,7 @@ def undo(self, n=1):
         entries = list(self.rl_history.entries)
 
         self.history = self.history[:-n]
-        if (n == 1 and self.buffer and
-            hasattr(self, 'take_back_buffer_line')):
-            self.take_back_buffer_line()
-        else:
-            self.reevaluate()
+        self.reevaluate()
 
         self.rl_history.entries = entries
 
