ipython · jenshnielsen · Jun 1, 2026 · Jun 1, 2026 · Jun 23, 2026
diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
@@ -116,7 +116,7 @@ def get_code_name(self, raw_code, transformed_code, number):
         """
         return code_name(transformed_code, number)
 
-    def format_code_name(self, name) -> str:
+    def format_code_name(self, name) -> tuple[str, str] | None:
         """Return a user-friendly label and name for a code block.
 
         Parameters

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
@@ -299,17 +299,18 @@ def __init__(
             self.curframe = None
 
         # IPython changes...
-        self.shell = get_ipython()
+        shell = get_ipython()
 
-        if self.shell is None:
+        if shell is None:
             save_main = sys.modules["__main__"]
             # No IPython instance running, we must create one
             from IPython.terminal.interactiveshell import TerminalInteractiveShell
 
-            self.shell = TerminalInteractiveShell.instance()
+            shell = TerminalInteractiveShell.instance()
             # needed by any code which calls __import__("__main__") after
             # the debugger was entered. See also #9941.
             sys.modules["__main__"] = save_main
+        self.shell = shell
 
         self.aliases = {}
 

diff --git a/IPython/core/getipython.py b/IPython/core/getipython.py
@@ -1,23 +1,27 @@
-"""Simple function to call to get the current InteractiveShell instance
-"""
+"""Simple function to call to get the current InteractiveShell instance"""
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Copyright (C) 2013  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Classes and functions
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from IPython.core.interactiveshell import InteractiveShell
 
 
-def get_ipython():
+def get_ipython() -> "InteractiveShell | None":
     """Get the global InteractiveShell instance.
 
     Returns None if no InteractiveShell instance is registered.
     """
     from IPython.core.interactiveshell import InteractiveShell
+
     if InteractiveShell.initialized():
         return InteractiveShell.instance()