Use Optional, as | fails at runtime for qtconsole

Author: Carreau

ipykernel/inprocess/client.py

@@ -12,7 +12,7 @@
 # -----------------------------------------------------------------------------
 
 
-from typing import Any
+from typing import Any, Optional
 
 from jupyter_client.client import KernelClient
 from jupyter_client.clientabc import KernelClientABC
@@ -110,8 +110,8 @@ async def execute(  # type:ignore [override]
         code: str,
         silent: bool = False,
         store_history: bool = True,
-        user_expressions: dict[str, Any] | None = None,
-        allow_stdin: bool | None = None,
+        user_expressions: Optional[dict[str, Any]] = None,
+        allow_stdin: Optional[bool] = None,
         stop_on_error: bool = True,
     ) -> str:
         """Execute code on the client."""

tests/test_subshells.py

@@ -218,7 +218,7 @@ def test_run_concurrently_timing(include_main_shell):
         assert duration < timedelta(seconds=sum(times))
 
 
-@pytest.mark.xfail(struct=False, reason="subshell still sometime give different results")
+@pytest.mark.xfail(strict=False, reason="subshell still sometime give different results")
 def test_execution_count():
     with new_kernel() as kc:
         subshell_id = create_subshell_helper(kc)["subshell_id"]