Merge remote-tracking branch 'kbaikov/mypy-fixes9'

Author: jdavid

pygit2/_libgit2/ffi.pyi

@@ -335,6 +335,8 @@ def new(a: Literal['git_buf *'], b: tuple[NULL_TYPE, Literal[0]]) -> GitBufC: ..
 @overload
 def new(a: Literal['char **']) -> _Pointer[char_pointer]: ...
 @overload
+def new(a: Literal['void **'], b: bytes) -> _Pointer[bytes]: ...
+@overload
 def new(a: Literal['char[]', 'char []'], b: bytes | NULL_TYPE) -> ArrayC[char]: ...
 @overload
 def new(

pygit2/config.py

@@ -110,7 +110,7 @@ def __del__(self) -> None:
         except AttributeError:
             pass
 
-    def _get(self, key: str | bytes) -> tuple[object, 'ConfigEntry']:
+    def _get(self, key: str | bytes) -> tuple[int, 'ConfigEntry']:
         key = str_to_bytes(key, 'key')
 
         entry = ffi.new('git_config_entry **')

pygit2/errors.py

@@ -32,7 +32,7 @@
 value_errors = set([C.GIT_EEXISTS, C.GIT_EINVALIDSPEC, C.GIT_EAMBIGUOUS])
 
 
-def check_error(err, io: bool = False) -> None:
+def check_error(err: int, io: bool = False) -> None:
     if err >= 0:
         return
 

pygit2/utils.py

@@ -93,7 +93,7 @@ def to_str(s: str | bytes | os.PathLike[str] | os.PathLike[bytes]) -> str:
     raise TypeError(f'unexpected type "{repr(s)}"')
 
 
-def ptr_to_bytes(ptr_cdata):
+def ptr_to_bytes(ptr_cdata) -> bytes:
     """
     Convert a pointer coming from C code (<cdata 'some_type *'>)
     to a byte buffer containing the address that the pointer refers to.