typing lint now that we require 3.9

docs/conf.py

@@ -13,7 +13,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Any, Dict, List
+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
@@ -70,7 +70,7 @@
 # built documents.
 #
 
-version_ns: Dict[str, Any] = {}
+version_ns: dict[str, Any] = {}
 here = Path(__file__).parent.resolve()
 version_py = Path(here) / os.pardir / "ipykernel" / "_version.py"
 with open(version_py) as f:
@@ -159,7 +159,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[str] = []
+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
@@ -226,7 +226,7 @@
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements: Dict[str, object] = {}
+latex_elements: dict[str, object] = {}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,

ipykernel/_version.py

@@ -2,7 +2,6 @@
 store the current version info of the server.
 """
 import re
-from typing import List
 
 # Version string must appear intact for hatch versioning
 __version__ = "7.0.0a0"
@@ -11,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[object] = [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

@@ -130,7 +130,7 @@ def _reset_tcp_pos(self):
 
     def _put_message(self, raw_msg):
         self.log.debug("QUEUE - _put_message:")
-        msg = t.cast(t.Dict[str, t.Any], 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)

ipykernel/inprocess/channels.py

@@ -3,8 +3,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from typing import List
-
 from jupyter_client.channelsabc import HBChannelABC
 
 # -----------------------------------------------------------------------------
@@ -15,7 +13,7 @@
 class InProcessChannel:
     """Base class for in-process channels."""
 
-    proxy_methods: List[object] = []
+    proxy_methods: list[object] = []
 
     def __init__(self, client=None):
         """Initialize the channel."""

ipykernel/iostream.py

@@ -15,7 +15,7 @@
 from collections import defaultdict, deque
 from io import StringIO, TextIOBase
 from threading import Event, Thread, local
-from typing import Any, Callable, Deque, Dict, Optional
+from typing import Any, Callable, Optional
 
 import zmq
 from anyio import create_task_group, run, sleep, to_thread
@@ -94,8 +94,8 @@ def __init__(self, socket, pipe=False):
         if pipe:
             self._setup_pipe_in()
         self._local = threading.local()
-        self._events: Deque[Callable[..., Any]] = deque()
-        self._event_pipes: Dict[threading.Thread, Any] = {}
+        self._events: deque[Callable[..., Any]] = deque()
+        self._event_pipes: dict[threading.Thread, Any] = {}
         self._event_pipe_gc_lock: threading.Lock = threading.Lock()
         self._event_pipe_gc_seconds: float = 10
         self._setup_event_pipe()
@@ -470,7 +470,7 @@ def __init__(
         self.pub_thread = pub_thread
         self.name = name
         self.topic = b"stream." + name.encode()
-        self._parent_header: contextvars.ContextVar[Dict[str, Any]] = contextvars.ContextVar(
+        self._parent_header: contextvars.ContextVar[dict[str, Any]] = contextvars.ContextVar(
             "parent_header"
         )
         self._parent_header.set({})

ipykernel/pickleutil.py

@@ -209,7 +209,7 @@ def __init__(self, f):
         """Initialize the can"""
         self._check_type(f)
         self.code = f.__code__
-        self.defaults: typing.Optional[typing.List[typing.Any]]
+        self.defaults: typing.Optional[list[typing.Any]]
         if f.__defaults__:
             self.defaults = [can(fd) for fd in f.__defaults__]
         else:
@@ -475,7 +475,7 @@ def uncan_sequence(obj, g=None):
 if buffer is not memoryview:
     can_map[buffer] = CannedBuffer
 
-uncan_map: typing.Dict[type, typing.Any] = {
+uncan_map: dict[type, typing.Any] = {
     CannedObject: lambda obj, g: obj.get_object(g),
     dict: uncan_dict,
 }

ipykernel/thread.py

@@ -17,7 +17,7 @@ def __init__(self, **kwargs):
         self.pydev_do_not_trace = True
         self.is_pydev_daemon_thread = True
         self.__stop = Event()
-        self._tasks_and_args: t.List[t.Tuple[t.Any, t.Any]] = []
+        self._tasks_and_args: list[tuple[t.Any, t.Any]] = []
 
     def add_task(self, task: t.Any, *args: t.Any) -> None:
         # May only add tasks before the thread is started.