make self.done a property based on self.buffer

thomasballinger · thomasballinger · commit 1389af43e05f · 2014-03-22T11:31:48.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -204,7 +204,6 @@ def smarter_request_refresh():
         self.scroll_offset = 0 # how many times display has been scrolled down
                                # because there wasn't room to display everything
         self.cursor_offset_in_line = 0 # from the left, 0 means first char
-        self.done = True # whether the current block is finished yet
 
         self.coderunner = CodeRunner(self.interp, self.request_refresh)
         self.stdout = FakeOutput(self.coderunner, self.send_to_stdout)
@@ -220,6 +219,11 @@ def smarter_request_refresh():
         self.height = None
         self.start_background_tasks()
 
+    @property
+    def done(self):
+        """Whether the last block is complete - which prompt to use, ps1 or ps2"""
+        return not self.buffer
+
     def __enter__(self):
         self.orig_stdout = sys.stdout
         self.orig_stderr = sys.stderr
@@ -529,7 +533,6 @@ def run_code_and_maybe_finish(self, for_code=None):
 
             self._current_line = ' '*indent
             self.cursor_offset_in_line = len(self._current_line)
-            self.done = not unfinished
 
     def keyboard_interrupt(self):
         #TODO factor out the common cleanup from running a line
@@ -545,7 +548,6 @@ def keyboard_interrupt(self):
         self.saved_indent = 0
         self._current_line = ''
         self.cursor_offset_in_line = len(self._current_line)
-        self.done = True
 
     def unhighlight_paren(self):
         """modify line in self.display_buffer to unhighlight a paren if possible
@@ -835,8 +837,6 @@ def reevaluate(self, insert_into_history=False):
         self.history = []
         self.display_lines = []
 
-        self.done = True # this keeps the first prompt correct
-
         if not self.weak_rewind:
             self.interp = code.InteractiveInterpreter()
             self.coderunner.interp = self.interp
@@ -888,7 +888,6 @@ def clear_current_block(self):
         self.saved_indent = 0
         self._current_line = ''
         self.cursor_offset_in_line = len(self._current_line)
-        self.done = True
 
     def send_current_block_to_external_editor(self, filename=None):
         text = self.send_to_external_editor(self.get_current_block())
