cleaned up about_to_exit hack in curtsies

thomasballinger · thomasballinger · commit daf145c4b884 · 2014-02-28T09:59:59.000-05:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -44,8 +44,7 @@ def process_event(e):
                     try:
                         repl.process_event(e)
                     except SystemExitFromCodeThread:
-                        #Get rid of nasty constant
-                        array, cursor_pos = repl.paint(about_to_exit=2)
+                        array, cursor_pos = repl.paint(about_to_exit=True, user_quit=True)
                         term.render_to_terminal(array, cursor_pos)
                         raise
                     except SystemExit:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -627,7 +627,7 @@ def current_output_line(self, value):
         self.current_stdouterr_line = ''
         self.stdin.current_line = '\n'
 
-    def paint(self, about_to_exit=False):
+    def paint(self, about_to_exit=False, user_quit=False):
         """Returns an array of min_height or more rows and width columns, plus cursor position
 
         Paints the entire screen - ideally the terminal display layer will take a diff and only
@@ -676,7 +676,7 @@ def paint(self, about_to_exit=False):
             arr[:history.height,:history.width] = history
 
         current_line = paint.paint_current_line(min_height, width, self.current_cursor_line)
-        if about_to_exit == 2: # hack for quit() in user code
+        if user_quit: # quit() or exit() in interp
             current_line_start_row = current_line_start_row - current_line.height
         logging.debug("---current line row slice %r, %r", current_line_start_row, current_line_start_row + current_line.height)
         logging.debug("---current line col slice %r, %r", 0, current_line.width)
