diff --git a/.flake8 b/.flake8
deleted file mode 100644
index c321e71c..00000000
--- a/.flake8
+++ /dev/null
@@ -1,5 +0,0 @@
-[flake8]
-ignore = E203, E266, E501, W503
-max-line-length = 80
-max-complexity = 18
-select = B,C,E,F,W,T4,B9
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8e04fae2..1b14b0cd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -45,7 +45,7 @@ jobs:
         run: |
           pytest --cov=bpython --cov-report=xml -v
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
         with:
diff --git a/bpython/patch_linecache.py b/bpython/patch_linecache.py
index fa8e1729..78b35684 100644
--- a/bpython/patch_linecache.py
+++ b/bpython/patch_linecache.py
@@ -36,6 +36,11 @@ def remember_bpython_input(self, source: str) -> str:
         )
         return filename
 
+    def get(self, key: Any, default: Any | None = None) -> Any:
+        if self.is_bpython_filename(key):
+            return self.get_bpython_history(key)
+        return super().get(key, default)
+
     def __getitem__(self, key: Any) -> Any:
         if self.is_bpython_filename(key):
             return self.get_bpython_history(key)
diff --git a/bpython/repl.py b/bpython/repl.py
index 2ced5b7a..93ce5cbc 100644
--- a/bpython/repl.py
+++ b/bpython/repl.py
@@ -337,7 +337,7 @@ def clear(self) -> None:
 
 
 class Interaction(metaclass=abc.ABCMeta):
-    def __init__(self, config: Config):
+    def __init__(self, config: Config) -> None:
         self.config = config
 
     @abc.abstractmethod
@@ -356,7 +356,7 @@ def file_prompt(self, s: str) -> str | None:
 
 
 class NoInteraction(Interaction):
-    def __init__(self, config: Config):
+    def __init__(self, config: Config) -> None:
         super().__init__(config)
 
     def confirm(self, s: str) -> bool:
@@ -467,7 +467,7 @@ def cursor_offset(self, value: int) -> None:
         # not actually defined, subclasses must define
         cpos: int
 
-    def __init__(self, interp: Interpreter, config: Config):
+    def __init__(self, interp: Interpreter, config: Config) -> None:
         """Initialise the repl.
 
         interp is a Python code.InteractiveInterpreter instance
@@ -851,7 +851,7 @@ def next_indentation(self) -> int:
             )
             if indentation and self.config.dedent_after > 0:
 
-                def line_is_empty(line):
+                def line_is_empty(line: str) -> bool:
                     return not line.strip()
 
                 empty_lines = takewhile(line_is_empty, reversed(self.buffer))
@@ -942,7 +942,7 @@ def copy2clipboard(self) -> None:
         else:
             self.interact.notify(_("Copied content to clipboard."))
 
-    def pastebin(self, s=None) -> str | None:
+    def pastebin(self, s: str | None = None) -> str | None:
         """Upload to a pastebin and display the URL in the status bar."""
 
         if s is None:
@@ -956,9 +956,8 @@ def pastebin(self, s=None) -> str | None:
         else:
             return self.do_pastebin(s)
 
-    def do_pastebin(self, s) -> str | None:
+    def do_pastebin(self, s: str) -> str | None:
         """Actually perform the upload."""
-        paste_url: str
         if s == self.prev_pastebin_content:
             self.interact.notify(
                 _("Duplicate pastebin. Previous URL: %s. " "Removal URL: %s")
@@ -989,7 +988,7 @@ def do_pastebin(self, s) -> str | None:
 
         return paste_url
 
-    def push(self, line, insert_into_history=True) -> bool:
+    def push(self, line: str, insert_into_history: bool = True) -> bool:
         """Push a line of code onto the buffer so it can process it all
         at once when a code block ends"""
         # This push method is used by cli and urwid, but not curtsies
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
index e5bc0895..3d40d198 100644
--- a/bpython/test/test_interpreter.py
+++ b/bpython/test/test_interpreter.py
@@ -1,12 +1,9 @@
-import sys
 import unittest
 
 from curtsies.fmtfuncs import bold, green, magenta, cyan, red, plain
 
 from bpython.curtsiesfrontend import interpreter
 
-pypy = "PyPy" in sys.version
-
 
 class Interpreter(interpreter.Interp):
     def __init__(self):
@@ -48,42 +45,9 @@ def gfunc():
 
         i.runsource("gfunc()")
 
-        global_not_found = "name 'gfunc' is not defined"
-
-        if (3, 13) <= sys.version_info[:2] or pypy:
-            expected = (
-                "Traceback (most recent call last):\n  File "
-                + green('"<input>"')
-                + ", line "
-                + bold(magenta("1"))
-                + ", in "
-                + cyan("<module>")
-                + "\n    gfunc()"
-                + "\n    ^^^^^\n"
-                + bold(red("NameError"))
-                + ": "
-                + cyan(global_not_found)
-                + "\n"
-            )
-        else:
-            expected = (
-                "Traceback (most recent call last):\n  File "
-                + green('"<input>"')
-                + ", line "
-                + bold(magenta("1"))
-                + ", in "
-                + cyan("<module>")
-                + "\n    gfunc()"
-                + "\n     ^^^^^\n"
-                + bold(red("NameError"))
-                + ": "
-                + cyan(global_not_found)
-                + "\n"
-            )
-
-        a = i.a
-        self.assertMultiLineEqual(str(expected), str(plain("").join(a)))
-        self.assertEqual(expected, plain("").join(a))
+        a = str(plain("").join(i.a))
+        self.assertIn("name 'gfunc' is not defined", a)
+        self.assertIn("NameErro", a)
 
     def test_getsource_works_on_interactively_defined_functions(self):
         source = "def foo(x):\n    return x + 1\n"