From 8c4901d691b1f309da3b80eefad5af13d7418185 Mon Sep 17 00:00:00 2001
From: M Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 14 Nov 2024 23:30:37 -0800
Subject: [PATCH] Misc type annotations (#1294)

---
 ipykernel/kernelapp.py | 17 ++++++++++-------
 pyproject.toml         |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ipykernel/kernelapp.py b/ipykernel/kernelapp.py
index 55efaa8e..66b750b2 100644
--- a/ipykernel/kernelapp.py
+++ b/ipykernel/kernelapp.py
@@ -16,6 +16,7 @@
 from io import FileIO, TextIOWrapper
 from logging import StreamHandler
 from pathlib import Path
+from typing import Optional
 
 import zmq
 import zmq.asyncio
@@ -54,6 +55,7 @@
 from .ipkernel import IPythonKernel
 from .parentpoller import ParentPollerUnix, ParentPollerWindows
 from .shellchannel import ShellChannelThread
+from .thread import BaseThread
 from .zmqshell import ZMQInteractiveShell
 
 # -----------------------------------------------------------------------------
@@ -142,9 +144,10 @@ class IPKernelApp(BaseIPythonApplication, InteractiveShellApp, ConnectionFileMix
     debug_shell_socket = Any()
     stdin_socket = Any()
     iopub_socket = Any()
-    iopub_thread = Any()
-    control_thread = Any()
-    shell_channel_thread = Any()
+
+    iopub_thread: Optional[IOPubThread] = Instance(IOPubThread, allow_none=True)  # type:ignore[assignment]
+    control_thread: Optional[BaseThread] = Instance(BaseThread, allow_none=True)  # type:ignore[assignment]
+    shell_channel_thread: Optional[BaseThread] = Instance(BaseThread, allow_none=True)  # type:ignore[assignment]
 
     _ports = Dict()
 
@@ -261,7 +264,7 @@ def _bind_socket(self, s, port):
                     raise
         return None
 
-    def write_connection_file(self):
+    def write_connection_file(self, **kwargs: t.Any) -> None:
         """write connection info to JSON file"""
         cf = self.abs_connection_file
         connection_info = dict(
@@ -401,15 +404,15 @@ def close(self):
         if self.heartbeat:
             self.log.debug("Closing heartbeat channel")
             self.heartbeat.context.term()
-        if self.iopub_thread:
+        if self.iopub_thread is not None:
             self.log.debug("Closing iopub channel")
             self.iopub_thread.stop()
             self.iopub_thread.close()
-        if self.control_thread and self.control_thread.is_alive():
+        if self.control_thread is not None and self.control_thread.is_alive():
             self.log.debug("Closing control thread")
             self.control_thread.stop()
             self.control_thread.join()
-        if self.shell_channel_thread and self.shell_channel_thread.is_alive():
+        if self.shell_channel_thread is not None and self.shell_channel_thread.is_alive():
             self.log.debug("Closing shell channel thread")
             self.shell_channel_thread.stop()
             self.shell_channel_thread.join()
diff --git a/pyproject.toml b/pyproject.toml
index 675d9d87..2360b668 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -276,6 +276,8 @@ ignore = [
   "G002",
   # `open()` should be replaced by `Path.open()`
   "PTH123",
+  # use `X | Y` for type annotations, this does not works for dynamic getting type hints on older python
+  "UP007",
 ]
 unfixable = [
   # Don't touch print statements