bpython
diff --git a/‎bpython/cli.py‎
Lines changed: 5 additions & 14 deletions b/‎bpython/cli.py‎
Lines changed: 5 additions & 14 deletions
diff --git a/‎bpython/repl.py‎
Lines changed: 1 addition & 3 deletions b/‎bpython/repl.py‎
Lines changed: 1 addition & 3 deletions
@@ -454,21 +454,13 @@ def complete(self, tab=False):
         Called whenever these should be updated, and called
         with tab
         """
-        if self.paste_mode and self.list_win_visible:
-            self.scr.touchwin()
-
         if self.paste_mode:
-            return
-
-        if self.list_win_visible and not self.config.auto_display_list:
-            self.scr.touchwin()
-            self.list_win_visible = False
-            self.matches_iter.clear()
+            self.scr.touchwin() #TODO necessary?
             return
 
         if self.config.auto_display_list or tab:
-            self.list_win_visible = repl.Repl.complete(self, tab)
-            if self.list_win_visible:
+            list_win_visible = repl.Repl.complete(self, tab)
+            if list_win_visible:
                 try:
                     self.show_list(self.matches_iter.matches, topline=self.argspec, formatter=self.matches_iter.completer.format)
                 except curses.error:
@@ -477,8 +469,8 @@ def complete(self, tab=False):
                     # using it.
                     self.list_win.border()
                     self.list_win.refresh()
-                    self.list_win_visible = False
-            if not self.list_win_visible:
+                    list_win_visible = False
+            if not list_win_visible:
                 self.scr.redrawwin()
                 self.scr.refresh()
 
@@ -1463,7 +1455,6 @@ def tab(self, back=False):
             self.print_line(self.s)
             if not self.matches_iter and self.config.auto_display_list:
                 self.complete()
-                #self.scr.touchwin() #TODO necessary?
 
         # 4. swap current word for a match list item
         elif self.matches_iter.matches:
 
@@ -420,7 +420,6 @@ def __init__(self, interp, config):
         self.argspec = None
         self.current_func = None
         self.highlighted_paren = None
-        self.list_win_visible = False
         self._C = {}
         self.prev_block_finished = 0
         self.interact = Interaction(self.config)
@@ -641,8 +640,7 @@ def complete(self, tab=False):
                                          self.current_line(),
                                          matches, completer)
                 self.matches_iter.next()
-                self.list_win_visible = True #TODO what else is list_win_visible used for?
-                if tab: # if this complete is being run for a tab key press, do the swap
+                if tab: # if this complete is being run for a tab key press, tab() to do the swap
                     self.tab()
                     self.matches_iter.clear()
                     return False