feat: drop support for python 3.9 (#377)

EOL is approaching

BREAKING CHANGE:

Author: linuxdaemon

.github/workflows/python-tests.yml

@@ -25,7 +25,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'

.pre-commit-config.yaml

@@ -58,7 +58,7 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - --py39-plus
+          - --py310-plus
   - repo: https://github.com/MarcoGorelli/auto-walrus
     rev: ba0661836089a532a710f68713a3e3e53f7f0113  # frozen: 0.3.4
     hooks:

irclib/parser.py

@@ -8,9 +8,9 @@
 import warnings
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterable, Iterator, Sequence
-from typing import Final, Literal, Optional, Union, cast
+from typing import Final, Literal, Optional, TypeAlias, cast
 
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self
 
 from irclib.errors import ParseError
 
@@ -59,7 +59,7 @@
 
 
 def parse_server_time(
-    value: Optional[str], default: datetime.datetime
+    value: str | None, default: datetime.datetime
 ) -> datetime.datetime:
     if value:
         return datetime.datetime.strptime(
@@ -86,7 +86,7 @@ def __str__(self) -> str:
 class Cap(Parseable):
     """Represents a CAP entity as defined in IRCv3.2."""
 
-    def __init__(self, name: str, value: Optional[str] = None) -> None:
+    def __init__(self, name: str, value: str | None = None) -> None:
         """Construct Cap object.
 
         Args:
@@ -102,11 +102,11 @@ def name(self) -> str:
         return self._name
 
     @property
-    def value(self) -> Optional[str]:
+    def value(self) -> str | None:
         """CAP value."""
         return self._value
 
-    def as_tuple(self) -> tuple[str, Optional[str]]:
+    def as_tuple(self) -> tuple[str, str | None]:
         """Get data as a tuple of values."""
         return self.name, self.value
 
@@ -307,9 +307,10 @@ def __init__(self, tags: Iterable[MessageTag] = ()) -> None:
     @staticmethod
     def _cmp_type_map(
         obj: object,
-    ) -> Union[
-        tuple[dict[str, MessageTag], Literal[True]], tuple[None, Literal[False]]
-    ]:
+    ) -> (
+        tuple[dict[str, MessageTag], Literal[True]]
+        | tuple[None, Literal[False]]
+    ):
         if isinstance(obj, str):
             return TagList.parse(obj), True
 
@@ -367,9 +368,9 @@ class Prefix(Parseable):
 
     def __init__(
         self,
-        nick: Optional[str] = None,
-        user: Optional[str] = None,
-        host: Optional[str] = None,
+        nick: str | None = None,
+        user: str | None = None,
+        host: str | None = None,
     ) -> None:
         """Construct a prefix."""
         self._nick = nick or ""
@@ -558,7 +559,7 @@ def __str__(self) -> str:
 
 
 def _parse_tags(
-    tags: Union[TagList, dict[str, str], str, None, list[str]],
+    tags: TagList | dict[str, str] | str | None | list[str],
 ) -> MsgTagList:
     if isinstance(tags, TagList):
         return tags
@@ -575,7 +576,7 @@ def _parse_tags(
     return TagList(MessageTag.parse(str(tag)) for tag in tags)
 
 
-def _parse_prefix(prefix: Union[Prefix, str, None, Iterable[str]]) -> MsgPrefix:
+def _parse_prefix(prefix: Prefix | str | None | Iterable[str]) -> MsgPrefix:
     if isinstance(prefix, Prefix):
         return prefix
 
@@ -589,7 +590,7 @@ def _parse_prefix(prefix: Union[Prefix, str, None, Iterable[str]]) -> MsgPrefix:
 
 
 def _parse_params(
-    parameters: tuple[Union[str, list[str], ParamList], ...],
+    parameters: tuple[str | list[str] | ParamList, ...],
 ) -> ParamList:
     if len(parameters) == 1 and not isinstance(parameters[0], str):
         # This seems to be a list
@@ -606,11 +607,11 @@ class Message(Parseable):
 
     def __init__(
         self,
-        tags: Union[TagList, dict[str, str], str, None, list[str]],
-        prefix: Union[str, Prefix, None, Iterable[str]],
+        tags: TagList | dict[str, str] | str | None | list[str],
+        prefix: str | Prefix | None | Iterable[str],
         command: str,
-        *parameters: Union[str, list[str], ParamList],
-        time: Optional[datetime.datetime] = None,
+        *parameters: str | list[str] | ParamList,
+        time: datetime.datetime | None = None,
     ) -> None:
         """Construct message object."""
         self._tags = _parse_tags(tags)
@@ -638,7 +639,7 @@ def has_tag(self, name: str) -> bool:
 
         return name in self.tags
 
-    def get_tag_value(self, name: str) -> Optional[str]:
+    def get_tag_value(self, name: str) -> str | None:
         """Get value for a message tag, or None if not set."""
         if self.tags and name in self.tags:
             return self.tags[name].value
@@ -654,12 +655,12 @@ def time(self) -> datetime.datetime:
         return parse_server_time(self.get_tag_value("time"), self._time)
 
     @property
-    def message_id(self) -> Optional[str]:
+    def message_id(self) -> str | None:
         """Unique message ID provided by server."""
         return self.get_tag_value("msgid")
 
     @property
-    def batch_id(self) -> Optional[str]:
+    def batch_id(self) -> str | None:
         """Batch ID provided by server."""
         return self.get_tag_value("batch")
 
@@ -689,16 +690,13 @@ def as_tuple(self) -> MessageTuple:
 
     @classmethod
     def parse(
-        cls,
-        text: Union[str, bytes],
-        *,
-        time: Optional[datetime.datetime] = None,
+        cls, text: str | bytes, *, time: datetime.datetime | None = None
     ) -> Self:
         """Parse an IRC message in to objects."""
         if isinstance(text, memoryview):
             text = text.tobytes().decode(errors="ignore")
 
-        if isinstance(text, (bytes, bytearray)):
+        if isinstance(text, bytes | bytearray):
             text = text.decode(errors="ignore")
 
         tags = ""
@@ -720,7 +718,7 @@ def parse(
 
     def __eq__(self, other: object) -> bool:
         """Compare to another message which can be str, bytes, or a Message object."""
-        if isinstance(other, (str, bytes)):
+        if isinstance(other, str | bytes):
             return self == Message.parse(other)
 
         if isinstance(other, Message):
@@ -730,7 +728,7 @@ def __eq__(self, other: object) -> bool:
 
     def __ne__(self, other: object) -> bool:
         """Compare to another message which can be str, bytes, or a Message object."""
-        if isinstance(other, (str, bytes)):
+        if isinstance(other, str | bytes):
             return self != Message.parse(other)
 
         if isinstance(other, Message):

irclib/util/commands.py

@@ -1,7 +1,7 @@
 """IRC command data and utilities."""
 
 from collections.abc import Iterator, Mapping
-from typing import Optional, cast
+from typing import cast
 
 import attr
 
@@ -13,7 +13,7 @@ class CommandArgument:
     """A single IRC command argument."""
 
     name: str
-    required: Optional[bool] = True
+    required: bool | None = True
 
     @classmethod
     def parse(cls, s: str) -> "CommandArgument":
@@ -47,7 +47,7 @@ class Command:
     name: str
     args: list[CommandArgument]
     min_args: int = 0
-    max_args: Optional[int] = None
+    max_args: int | None = None
 
 
 class LookupDict(Mapping[str, Command]):

irclib/util/frozendict.py

@@ -1,7 +1,7 @@
 """Frozen Dict."""
 
 from collections.abc import Iterable, Iterator, Mapping
-from typing import Optional, TypeVar, Union
+from typing import TypeVar
 
 from typing_extensions import Self
 
@@ -20,14 +20,14 @@ class FrozenDict(Mapping[str, _V]):
 
     def __init__(
         self,
-        seq: Union[Mapping[str, _V], Iterable[tuple[str, _V]], None] = None,
+        seq: Mapping[str, _V] | Iterable[tuple[str, _V]] | None = None,
         **kwargs: _V,
     ) -> None:
         """Construct a FrozenDict."""
         d = dict(seq, **kwargs) if seq is not None else dict(**kwargs)
 
         self.__data: dict[str, _V] = d
-        self.__hash: Optional[int] = None
+        self.__hash: int | None = None
 
     def copy(self, **kwargs: _V) -> Self:
         """Copy dict, replacing values according to kwargs.