Use modern python syntax for types and others

Since the minium declared python version is 3.10
we don't need the Union and Option and many
type imports should be done from collections.abc.

so i ran `fd --extension py --type f --exec pyupgrade --py310-plus`
on the repo.
All changes are automated, i.e. no manual edit.

Author: kbaikov

pygit2/__init__.py

@@ -364,17 +364,15 @@
 
 
 def init_repository(
-    path: typing.Union[str, bytes, os.PathLike, None],
+    path: str | bytes | os.PathLike | None,
     bare: bool = False,
     flags: enums.RepositoryInitFlag = enums.RepositoryInitFlag.MKPATH,
-    mode: typing.Union[
-        int, enums.RepositoryInitMode
-    ] = enums.RepositoryInitMode.SHARED_UMASK,
-    workdir_path: typing.Optional[str] = None,
-    description: typing.Optional[str] = None,
-    template_path: typing.Optional[str] = None,
-    initial_head: typing.Optional[str] = None,
-    origin_url: typing.Optional[str] = None,
+    mode: (int | enums.RepositoryInitMode) = enums.RepositoryInitMode.SHARED_UMASK,
+    workdir_path: str | None = None,
+    description: str | None = None,
+    template_path: str | None = None,
+    initial_head: str | None = None,
+    origin_url: str | None = None,
 ) -> Repository:
     """
     Creates a new Git repository in the given *path*.

pygit2/blame.py

@@ -23,7 +23,8 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from typing import TYPE_CHECKING, Iterator
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
 from ._pygit2 import Oid, Repository, Signature
 

pygit2/blob.py

@@ -3,7 +3,6 @@
 import time
 from contextlib import AbstractContextManager
 from queue import Queue
-from typing import Optional
 
 from ._pygit2 import Blob, Oid
 from .enums import BlobFilter
@@ -20,16 +19,16 @@ class _BlobIO(io.RawIOBase):
     def __init__(
         self,
         blob: Blob,
-        as_path: Optional[str] = None,
+        as_path: str | None = None,
         flags: BlobFilter = BlobFilter.CHECK_FOR_BINARY,
-        commit_id: Optional[Oid] = None,
+        commit_id: Oid | None = None,
     ):
         super().__init__()
         self._blob = blob
-        self._queue: Optional[Queue] = Queue(maxsize=1)
+        self._queue: Queue | None = Queue(maxsize=1)
         self._ready = threading.Event()
         self._writer_closed = threading.Event()
-        self._chunk: Optional[bytes] = None
+        self._chunk: bytes | None = None
         self._thread = threading.Thread(
             target=self._blob._write_to_queue,
             args=(self._queue, self._ready, self._writer_closed),
@@ -127,9 +126,9 @@ class BlobIO(io.BufferedReader, AbstractContextManager):
     def __init__(
         self,
         blob: Blob,
-        as_path: Optional[str] = None,
+        as_path: str | None = None,
         flags: BlobFilter = BlobFilter.CHECK_FOR_BINARY,
-        commit_id: Optional[Oid] = None,
+        commit_id: Oid | None = None,
     ):
         """Wrap the specified blob.
 

pygit2/branches.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterator
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
 from ._pygit2 import Branch, Commit, Oid
 from .enums import BranchType, ReferenceType
@@ -36,8 +37,8 @@
 
 
 class Branches:
-    local: 'Branches'
-    remote: 'Branches'
+    local: Branches
+    remote: Branches
 
     def __init__(
         self,
@@ -100,7 +101,7 @@ def _valid(self, branch: Branch) -> bool:
             or self._repository.descendant_of(branch_direct.target, self._commit)
         )
 
-    def with_commit(self, commit: Commit | Oid | str | None) -> 'Branches':
+    def with_commit(self, commit: Commit | Oid | str | None) -> Branches:
         assert self._commit is None
         return Branches(self._repository, self._flag, commit)
 

pygit2/callbacks.py

@@ -63,9 +63,10 @@
 """
 
 # Standard Library
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
 from functools import wraps
-from typing import TYPE_CHECKING, Callable, Generator, Optional, Union
+from typing import TYPE_CHECKING, Optional
 
 # pygit2
 from ._pygit2 import DiffFile, Oid
@@ -151,7 +152,7 @@ def sideband_progress(self, string: str) -> None:
     def credentials(
         self,
         url: str,
-        username_from_url: Union[str, None],
+        username_from_url: str | None,
         allowed_types: CredentialType,
     ) -> _Credentials:
         """
@@ -298,9 +299,9 @@ def checkout_notify(
         self,
         why: CheckoutNotify,
         path: str,
-        baseline: Optional[DiffFile],
-        target: Optional[DiffFile],
-        workdir: Optional[DiffFile],
+        baseline: DiffFile | None,
+        target: DiffFile | None,
+        workdir: DiffFile | None,
     ) -> None:
         """
         Checkout will invoke an optional notification callback for

pygit2/config.py

@@ -23,9 +23,10 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
+from collections.abc import Callable, Iterator
 from os import PathLike
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable, Iterator
+from typing import TYPE_CHECKING
 
 try:
     from functools import cached_property

pygit2/errors.py

@@ -27,7 +27,7 @@
 from ._pygit2 import GitError
 from .ffi import C, ffi
 
-value_errors = set([C.GIT_EEXISTS, C.GIT_EINVALIDSPEC, C.GIT_EAMBIGUOUS])
+value_errors = {C.GIT_EEXISTS, C.GIT_EINVALIDSPEC, C.GIT_EAMBIGUOUS}
 
 
 def check_error(err, io=False):
@@ -51,7 +51,7 @@ def check_error(err, io=False):
 
     if err == C.GIT_ENOTFOUND:
         if io:
-            raise IOError(message)
+            raise OSError(message)
 
         raise KeyError(message)
 

pygit2/filter.py

@@ -23,7 +23,8 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from typing import Callable, List, Optional
+
+from collections.abc import Callable
 
 from ._pygit2 import FilterSource
 
@@ -58,7 +59,7 @@ class Filter:
     def nattrs(cls) -> int:
         return len(cls.attributes.split())
 
-    def check(self, src: FilterSource, attr_values: List[Optional[str]]) -> None:
+    def check(self, src: FilterSource, attr_values: list[str | None]) -> None:
         """
         Check whether this filter should be applied to the given source.
 

pygit2/index.py

@@ -392,7 +392,7 @@ class MergeFileResult:
     automergeable: bool
     'True if the output was automerged, false if the output contains conflict markers'
 
-    path: typing.Union[str, None, PathLike[str]]
+    path: str | None | PathLike[str]
     'The path that the resultant merge file should use, or None if a filename conflict would occur'
 
     mode: FileMode

pygit2/references.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterator
+from collections.abc import Iterator
+from typing import TYPE_CHECKING
 
 from pygit2 import Oid
 
@@ -41,10 +42,10 @@ class References:
     def __init__(self, repository: BaseRepository) -> None:
         self._repository = repository
 
-    def __getitem__(self, name: str) -> 'Reference':
+    def __getitem__(self, name: str) -> Reference:
         return self._repository.lookup_reference(name)
 
-    def get(self, key: str) -> 'Reference' | None:
+    def get(self, key: str) -> Reference | None:
         try:
             return self[key]
         except KeyError:
@@ -61,7 +62,7 @@ def __iter__(self) -> Iterator[str]:
 
     def iterator(
         self, references_return_type: ReferenceFilter = ReferenceFilter.ALL
-    ) -> Iterator['Reference']:
+    ) -> Iterator[Reference]:
         """Creates a new iterator and fetches references for a given repository.
 
         Can also filter and pass all refs or only branches or only tags.
@@ -93,7 +94,7 @@ def iterator(
             else:
                 return
 
-    def create(self, name: str, target: Oid | str, force: bool = False) -> 'Reference':
+    def create(self, name: str, target: Oid | str, force: bool = False) -> Reference:
         return self._repository.create_reference(name, target, force)
 
     def delete(self, name: str) -> None:
@@ -103,7 +104,7 @@ def __contains__(self, name: str) -> bool:
         return self.get(name) is not None
 
     @property
-    def objects(self) -> list['Reference']:
+    def objects(self) -> list[Reference]:
         return self._repository.listall_reference_objects()
 
     def compress(self) -> None: