more cleanup

Author: blink1073

docs/conf.py

@@ -14,6 +14,7 @@
 
 import os
 import shutil
+from typing import Any
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -61,7 +62,7 @@
 # built documents.
 #
 
-version_ns: dict = {}
+version_ns: dict[str, Any] = {}
 here = os.path.dirname(__file__)
 version_py = os.path.join(here, os.pardir, "ipykernel", "_version.py")
 with open(version_py) as f:
@@ -150,7 +151,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path: list = []
+html_static_path: list[str] = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -217,7 +218,7 @@
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements: dict = {}
+latex_elements: dict[str, object] = {}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,

examples/embedding/inprocess_terminal.py

@@ -4,7 +4,7 @@
 import tornado
 from jupyter_console.ptshell import ZMQTerminalInteractiveShell
 
-from ipykernel.inprocess import InProcessKernelManager
+from ipykernel.inprocess.manager import InProcessKernelManager
 
 
 def print_process_id():

ipykernel/_version.py

@@ -10,7 +10,7 @@
 pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
 match = re.match(pattern, __version__)
 assert match is not None
-parts: list = [int(match[part]) for part in ["major", "minor", "patch"]]
+parts: list[object] = [int(match[part]) for part in ["major", "minor", "patch"]]
 if match["rest"]:
     parts.append(match["rest"])
 version_info = tuple(parts)

ipykernel/debugger.py

@@ -90,7 +90,7 @@ def __init__(self, event_callback, log):
         self.tcp_buffer = ""
         self._reset_tcp_pos()
         self.event_callback = event_callback
-        self.message_queue: Queue = Queue()
+        self.message_queue: Queue[t.Any] = Queue()
         self.log = log
 
     def _reset_tcp_pos(self):
@@ -101,7 +101,7 @@ def _reset_tcp_pos(self):
 
     def _put_message(self, raw_msg):
         self.log.debug("QUEUE - _put_message:")
-        msg = t.cast(dict, jsonapi.loads(raw_msg))
+        msg = t.cast(dict[str, t.Any], jsonapi.loads(raw_msg))
         if msg["type"] == "event":
             self.log.debug("QUEUE - received event:")
             self.log.debug(msg)
@@ -291,7 +291,7 @@ def __init__(
         self.is_started = False
         self.event_callback = event_callback
         self.just_my_code = just_my_code
-        self.stopped_queue: Queue = Queue()
+        self.stopped_queue: Queue[t.Any] = Queue()
 
         self.started_debug_handlers = {}
         for msg_type in Debugger.started_debug_msg_types:

ipykernel/gui/gtk3embed.py

@@ -14,11 +14,11 @@
 import sys
 
 # Third-party
-import gi  # type:ignore[import]
+import gi
 
 gi.require_version("Gdk", "3.0")
 gi.require_version("Gtk", "3.0")
-from gi.repository import GObject, Gtk  # type:ignore[import]
+from gi.repository import GObject, Gtk
 
 # -----------------------------------------------------------------------------
 # Classes and functions

ipykernel/gui/gtkembed.py

@@ -14,8 +14,8 @@
 import sys
 
 # Third-party
-import gobject  # type:ignore[import]
-import gtk  # type:ignore[import]
+import gobject
+import gtk
 
 # -----------------------------------------------------------------------------
 # Classes and functions

ipykernel/inprocess/blocking.py

@@ -23,7 +23,7 @@
 class BlockingInProcessChannel(InProcessChannel):
     def __init__(self, *args, **kwds):
         super().__init__(*args, **kwds)
-        self._in_queue: Queue = Queue()
+        self._in_queue: Queue[object] = Queue()
 
     def call_handlers(self, msg):
         self._in_queue.put(msg)

ipykernel/inprocess/channels.py

@@ -13,7 +13,7 @@
 class InProcessChannel:
     """Base class for in-process channels."""
 
-    proxy_methods: list = []
+    proxy_methods: list[object] = []
 
     def __init__(self, client=None):
         super().__init__()

ipykernel/iostream.py

@@ -13,7 +13,7 @@
 from binascii import b2a_hex
 from collections import deque
 from io import StringIO, TextIOBase
-from typing import Any, Optional
+from typing import Any, Optional, Callable
 from weakref import WeakSet
 
 import zmq
@@ -67,8 +67,8 @@ def __init__(self, socket, pipe=False):
         if pipe:
             self._setup_pipe_in()
         self._local = threading.local()
-        self._events: deque = deque()
-        self._event_pipes: WeakSet = WeakSet()
+        self._events: deque[Callable[..., Any]] = deque()
+        self._event_pipes: WeakSet[Any] = WeakSet()
         self._setup_event_pipe()
         self.thread = threading.Thread(target=self._thread_main, name="IOPub")
         self.thread.daemon = True

ipykernel/kernelbase.py

@@ -263,7 +263,7 @@ def __init__(self, **kwargs):
         for msg_type in self.control_msg_types:
             self.control_handlers[msg_type] = getattr(self, msg_type)
 
-        self.control_queue: Queue = Queue()
+        self.control_queue: Queue[Any] = Queue()
 
     def dispatch_control(self, msg):
         self.control_queue.put_nowait(msg)
@@ -279,7 +279,7 @@ async def poll_control_queue(self):
 
     async def _flush_control_queue(self):
         """Flush the control queue, wait for processing of any pending messages"""
-        tracer_future: t.Union[concurrent.futures.Future, asyncio.Future]
+        tracer_future: t.Union[concurrent.futures.Future[object], asyncio.Future[object]]
         if self.control_thread:
             control_loop = self.control_thread.io_loop
             # concurrent.futures.Futures are threadsafe
@@ -531,7 +531,7 @@ def schedule_dispatch(self, dispatch, *args):
     def start(self):
         """register dispatchers for streams"""
         self.io_loop = ioloop.IOLoop.current()
-        self.msg_queue: Queue = Queue()
+        self.msg_queue: Queue[Any] = Queue()
         self.io_loop.add_callback(self.dispatch_queue)
 
         self.control_stream.on_recv(self.dispatch_control, copy=False)