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/_build.py

@@ -48,7 +48,7 @@ def _get_libgit2_path():
 
     # Default
     if os.name == 'nt':
-        return Path(r'%s\libgit2' % os.getenv('ProgramFiles'))
+        return Path(r'{}\libgit2'.format(os.getenv('ProgramFiles')))
     return Path('/usr/local')
 
 

pygit2/_pygit2.pyi

@@ -1,14 +1,11 @@
+from collections.abc import Iterator, Sequence
 from io import DEFAULT_BUFFER_SIZE, IOBase
 from pathlib import Path
 from queue import Queue
 from threading import Event
 from typing import (
     Generic,
-    Iterator,
     Literal,
-    Optional,
-    Sequence,
-    Type,
     TypedDict,
     TypeVar,
     overload,
@@ -303,29 +300,34 @@ class _ObjectBase(Generic[T]):
     name: str | None
     raw_name: bytes | None
     short_id: str
-    type: 'Literal[GIT_OBJ_COMMIT] | Literal[GIT_OBJ_TREE] | Literal[GIT_OBJ_TAG] | Literal[GIT_OBJ_BLOB]'
-    type_str: "Literal['commit'] | Literal['tree'] | Literal['tag'] | Literal['blob']"
+    type: (
+        Literal[GIT_OBJ_COMMIT]
+        | Literal[GIT_OBJ_TREE]
+        | Literal[GIT_OBJ_TAG]
+        | Literal[GIT_OBJ_BLOB]
+    )
+    type_str: Literal['commit'] | Literal['tree'] | Literal['tag'] | Literal['blob']
     author: Signature
     committer: Signature
     tree: Tree
     @overload
     def peel(
-        self, target_type: 'Literal[GIT_OBJ_COMMIT, ObjectType.COMMIT] | Type[Commit]'
-    ) -> 'Commit': ...
+        self, target_type: Literal[GIT_OBJ_COMMIT, ObjectType.COMMIT] | type[Commit]
+    ) -> Commit: ...
     @overload
     def peel(
-        self, target_type: 'Literal[GIT_OBJ_TREE, ObjectType.TREE] | Type[Tree]'
-    ) -> 'Tree': ...
+        self, target_type: Literal[GIT_OBJ_TREE, ObjectType.TREE] | type[Tree]
+    ) -> Tree: ...
     @overload
     def peel(
-        self, target_type: 'Literal[GIT_OBJ_TAG, ObjectType.TAG] | Type[Tag]'
-    ) -> 'Tag': ...
+        self, target_type: Literal[GIT_OBJ_TAG, ObjectType.TAG] | type[Tag]
+    ) -> Tag: ...
     @overload
     def peel(
-        self, target_type: 'Literal[GIT_OBJ_BLOB, ObjectType.BLOB] | Type[Blob]'
-    ) -> 'Blob': ...
+        self, target_type: Literal[GIT_OBJ_BLOB, ObjectType.BLOB] | type[Blob]
+    ) -> Blob: ...
     @overload
-    def peel(self, target_type: 'None') -> 'Commit|Tree|Tag|Blob': ...
+    def peel(self, target_type: None) -> Commit | Tree | Tag | Blob: ...
     def read_raw(self) -> bytes: ...
     def __eq__(self, other) -> bool: ...
     def __ge__(self, other) -> bool: ...
@@ -350,15 +352,15 @@ class Reference:
     def delete(self) -> None: ...
     def log(self) -> Iterator[RefLogEntry]: ...
     @overload
-    def peel(self, type: 'Literal[GIT_OBJ_COMMIT] | Type[Commit]') -> 'Commit': ...
+    def peel(self, type: Literal[GIT_OBJ_COMMIT] | type[Commit]) -> Commit: ...
     @overload
-    def peel(self, type: 'Literal[GIT_OBJ_TREE] | Type[Tree]') -> 'Tree': ...
+    def peel(self, type: Literal[GIT_OBJ_TREE] | type[Tree]) -> Tree: ...
     @overload
-    def peel(self, type: 'Literal[GIT_OBJ_TAG] | Type[Tag]') -> 'Tag': ...
+    def peel(self, type: Literal[GIT_OBJ_TAG] | type[Tag]) -> Tag: ...
     @overload
-    def peel(self, type: 'Literal[GIT_OBJ_BLOB] | Type[Blob]') -> 'Blob': ...
+    def peel(self, type: Literal[GIT_OBJ_BLOB] | type[Blob]) -> Blob: ...
     @overload
-    def peel(self, type: 'None' = None) -> 'Commit|Tree|Tag|Blob': ...
+    def peel(self, type: None = None) -> Commit | Tree | Tag | Blob: ...
     def rename(self, new_name: str) -> None: ...
     def resolve(self) -> Reference: ...
     def set_target(self, target: _OidArg, message: str = ...) -> None: ...
@@ -384,7 +386,7 @@ class Blob(Object):
     ) -> Patch: ...
     def diff_to_buffer(
         self,
-        buffer: Optional[bytes | str] = None,
+        buffer: bytes | str | None = None,
         flag: DiffOption = DiffOption.NORMAL,
         old_as_path: str = ...,
         buffer_as_path: str = ...,
@@ -395,9 +397,9 @@ class Blob(Object):
         ready: Event,
         done: Event,
         chunk_size: int = DEFAULT_BUFFER_SIZE,
-        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,
     ) -> None: ...
     def __buffer__(self, flags: int) -> memoryview: ...
     def __release_buffer__(self, buffer: memoryview) -> None: ...
@@ -411,7 +413,7 @@ class Branch(Reference):
     def delete(self) -> None: ...
     def is_checked_out(self) -> bool: ...
     def is_head(self) -> bool: ...
-    def rename(self, name: str, force: bool = False) -> 'Branch': ...  # type: ignore[override]
+    def rename(self, name: str, force: bool = False) -> Branch: ...  # type: ignore[override]
 
 class FetchOptions:
     # incomplete
@@ -693,7 +695,7 @@ class Repository:
     def create_branch(self, name: str, commit: Commit, force=False) -> Branch: ...
     def create_commit(
         self,
-        reference_name: Optional[str],
+        reference_name: str | None,
         author: Signature,
         committer: Signature,
         message: str | bytes,
@@ -711,7 +713,7 @@ class Repository:
         encoding: str = ...,
     ) -> Oid: ...
     def create_commit_with_signature(
-        self, content: str, signature: str, signature_field: Optional[str] = None
+        self, content: str, signature: str, signature_field: str | None = None
     ) -> Oid: ...
     def create_note(
         self,
@@ -723,10 +725,10 @@ class Repository:
         force: bool = False,
     ) -> Oid: ...
     def create_reference_direct(
-        self, name: str, target: _OidArg, force: bool, message: Optional[str] = None
+        self, name: str, target: _OidArg, force: bool, message: str | None = None
     ) -> Reference: ...
     def create_reference_symbolic(
-        self, name: str, target: str, force: bool, message: Optional[str] = None
+        self, name: str, target: str, force: bool, message: str | None = None
     ) -> Reference: ...
     def create_tag(
         self, name: str, oid: _OidArg, type: ObjectType, tagger: Signature, message: str
@@ -801,7 +803,7 @@ class Signature:
         email: str,
         time: int = -1,
         offset: int = 0,
-        encoding: Optional[str] = None,
+        encoding: str | None = None,
     ) -> None: ...
     def __eq__(self, other) -> bool: ...
     def __ge__(self, other) -> bool: ...

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.