Some simplifications

sebastinas · sebastinas · commit df32e68b48b2 · 2022-05-15T20:27:20.000+02:00
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -94,9 +94,9 @@ def writetb(self, lines: Iterable[str]) -> None:
         # TODO for tracebacks get_lexer_by_name("pytb", stripall=True)
 
     def format(self, tbtext: str, lexer: Any) -> None:
-        # FIXME: lexer should is a Lexer
+        # FIXME: lexer should be "Lexer"
         traceback_informative_formatter = BPythonFormatter(default_colors)
-        traceback_code_formatter = BPythonFormatter({Token: ("d")})
+        traceback_code_formatter = BPythonFormatter({Token: "d"})
 
         no_format_mode = False
         cur_line = []
@@ -111,7 +111,7 @@ def format(self, tbtext: str, lexer: Any) -> None:
                         cur_line, self.outfile
                     )
                 cur_line = []
-            elif text == "    " and cur_line == []:
+            elif text == "    " and len(cur_line) == 0:
                 no_format_mode = True
                 cur_line.append((token, text))
             else:
@@ -130,9 +130,6 @@ def code_finished_will_parse(
     False, True means code block is unfinished
     False, False isn't possible - an predicted error makes code block done"""
     try:
-        finished = bool(compiler(s))
-        code_will_parse = True
+        return bool(compiler(s)), True
     except (ValueError, SyntaxError, OverflowError):
-        finished = True
-        code_will_parse = False
-    return finished, code_will_parse
+        return True, False
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1363,9 +1363,8 @@ def unhighlight_paren(self):
     def clear_current_block(self, remove_from_history=True):
         self.display_buffer = []
         if remove_from_history:
-            for unused in self.buffer:
-                self.history.pop()
-                self.all_logical_lines.pop()
+            del self.history[-len(self.buffer) :]
+            del self.all_logical_lines[-len(self.buffer) :]
         self.buffer = []
         self.cursor_offset = 0
         self.saved_indent = 0
@@ -2080,7 +2079,6 @@ def focus_on_subprocess(self, args):
         try:
             signal.signal(signal.SIGWINCH, self.orig_sigwinch_handler)
             with Termmode(self.orig_stdin, self.orig_tcattrs):
-                assert self.window is not None
                 terminal = self.window.t
                 with terminal.fullscreen():
                     sys.__stdout__.write(terminal.save)
