Initial formatting and liniting fix of all files

libgit2 · DinhHuy2010 · Dec 21, 2024 · Dec 21, 2024 · Dec 21, 2024 · Dec 21, 2024
commit 484886a335628d691bb971343e0699666f2b71b6
diff --git a/build_tag.py b/build_tag.py
@@ -1,4 +1,5 @@
-import platform, sys
+import platform
+import sys
 
 py = {'CPython': 'cp', 'PyPy': 'pp'}[platform.python_implementation()]
 print(f'{py}{sys.version_info.major}{sys.version_info.minor}')
diff --git a/pygit2/__init__.py b/pygit2/__init__.py
@@ -25,24 +25,31 @@
 
 # Standard Library
 import functools
-from os import PathLike
 import typing
-
-# Low level API
-from ._pygit2 import *
-from ._pygit2 import _cache_enums
+from os import PathLike
 
 # High level API
 from . import enums
 from ._build import __version__
+
+# Low level API
+from ._pygit2 import *
+from ._pygit2 import _cache_enums
 from .blame import Blame, BlameHunk
 from .blob import BlobIO
-from .callbacks import Payload, RemoteCallbacks, CheckoutCallbacks, StashApplyCallbacks
-from .callbacks import git_clone_options, git_fetch_options, get_credentials
+from .callbacks import (
+    CheckoutCallbacks,
+    Payload,
+    RemoteCallbacks,
+    StashApplyCallbacks,
+    get_credentials,
+    git_clone_options,
+    git_fetch_options,
+)
 from .config import Config
 from .credentials import *
-from .errors import check_error, Passthrough
-from .ffi import ffi, C
+from .errors import Passthrough, check_error
+from .ffi import C, ffi
 from .filter import Filter
 from .index import Index, IndexEntry
 from .legacyenums import *
@@ -53,7 +60,6 @@
 from .submodules import Submodule
 from .utils import to_bytes, to_str
 
-
 # Features
 features = enums.Feature(C.git_libgit2_features())
 

diff --git a/pygit2/_pygit2.pyi b/pygit2/_pygit2.pyi
@@ -1,5 +1,6 @@
-from typing import Iterator, Literal, Optional, overload
 from io import IOBase
+from typing import Iterator, Literal, Optional, overload
+
 from . import Index
 from .enums import (
     ApplyLocation,

diff --git a/pygit2/_run.py b/pygit2/_run.py
@@ -29,8 +29,8 @@
 
 # Import from the Standard Library
 import codecs
-from pathlib import Path
 import sys
+from pathlib import Path
 
 # Import from cffi
 from cffi import FFI

diff --git a/pygit2/blame.py b/pygit2/blame.py
@@ -24,9 +24,9 @@
 # Boston, MA 02110-1301, USA.
 
 # Import from pygit2
-from .ffi import ffi, C
+from ._pygit2 import Oid, Signature
+from .ffi import C, ffi
 from .utils import GenericIterator
-from ._pygit2 import Signature, Oid
 
 
 def wrap_signature(csig):

diff --git a/pygit2/blob.py b/pygit2/blob.py
@@ -2,8 +2,8 @@
 import threading
 import time
 from contextlib import AbstractContextManager
-from typing import Optional
 from queue import Queue
+from typing import Optional
 
 from ._pygit2 import Blob, Oid
 from .enums import BlobFilter

diff --git a/pygit2/branches.py b/pygit2/branches.py
@@ -24,10 +24,11 @@
 # Boston, MA 02110-1301, USA.
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
-from .enums import BranchType, ReferenceType
 from ._pygit2 import Commit, Oid
+from .enums import BranchType, ReferenceType
 
 # Need BaseRepository for type hints, but don't let it cause a circular dependency
 if TYPE_CHECKING:

diff --git a/pygit2/callbacks.py b/pygit2/callbacks.py
@@ -68,12 +68,11 @@
 from typing import Optional, Union
 
 # pygit2
-from ._pygit2 import Oid, DiffFile
+from ._pygit2 import DiffFile, Oid
 from .enums import CheckoutNotify, CheckoutStrategy, CredentialType, StashApplyProgress
-from .errors import check_error, Passthrough
-from .ffi import ffi, C
-from .utils import maybe_string, to_bytes, ptr_to_bytes, StrArray
-
+from .errors import Passthrough, check_error
+from .ffi import C, ffi
+from .utils import StrArray, maybe_string, ptr_to_bytes, to_bytes
 
 #
 # The payload is the way to pass information from the pygit2 API, through
@@ -471,9 +470,7 @@ def _certificate_check_cb(cert_i, valid, host, data):
         if not val:
             return C.GIT_ECERTIFICATE
     except Passthrough:
-        if is_ssh:
-            return 0
-        elif valid:
+        if is_ssh or valid:
             return 0
         else:
             return C.GIT_ECERTIFICATE
@@ -669,10 +666,7 @@ def _git_checkout_options(
     paths=None,
     c_checkout_options_ptr=None,
 ):
-    if callbacks is None:
-        payload = CheckoutCallbacks()
-    else:
-        payload = callbacks
+    payload = CheckoutCallbacks() if callbacks is None else callbacks
 
     # Get handle to payload
     handle = ffi.new_handle(payload)

diff --git a/pygit2/config.py b/pygit2/config.py
@@ -29,8 +29,10 @@
     from cached_property import cached_property
 
 # Import from pygit2
+import contextlib
+
 from .errors import check_error
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .utils import to_bytes
 
 
@@ -96,10 +98,8 @@ def from_c(cls, repo, ptr):
         return config
 
     def __del__(self):
-        try:
+        with contextlib.suppress(AttributeError):
             C.git_config_free(self._config)
-        except AttributeError:
-            pass
 
     def _get(self, key):
         key = str_to_bytes(key, 'key')

diff --git a/pygit2/credentials.py b/pygit2/credentials.py
@@ -23,9 +23,8 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-from .ffi import C
-
 from .enums import CredentialType
+from .ffi import C
 
 
 class Username:

diff --git a/pygit2/errors.py b/pygit2/errors.py
@@ -24,19 +24,18 @@
 # Boston, MA 02110-1301, USA.
 
 # Import from pygit2
-from .ffi import ffi, C
 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):
     if err >= 0:
         return
 
     # These are special error codes, they should never reach here
-    test = err != C.GIT_EUSER and err != C.GIT_PASSTHROUGH
+    test = err not in (C.GIT_EUSER, C.GIT_PASSTHROUGH)
     assert test, f'Unexpected error code {err}'
 
     # Error message

diff --git a/pygit2/ffi.py b/pygit2/ffi.py
@@ -24,4 +24,5 @@
 # Boston, MA 02110-1301, USA.
 
 # Import from pygit2
-from ._libgit2 import ffi, lib as C
+from ._libgit2 import ffi
+from ._libgit2 import lib as C
diff --git a/pygit2/index.py b/pygit2/index.py
@@ -27,12 +27,11 @@
 import weakref
 
 # Import from pygit2
-from ._pygit2 import Oid, Tree, Diff
+from ._pygit2 import Diff, Oid, Tree
 from .enums import DiffOption, FileMode
 from .errors import check_error
-from .ffi import ffi, C
-from .utils import to_bytes, to_str
-from .utils import GenericIterator, StrArray
+from .ffi import C, ffi
+from .utils import GenericIterator, StrArray, to_bytes, to_str
 
 
 class Index:
@@ -367,7 +366,7 @@ def oid(self):
     @property
     def hex(self):
         """The id of the referenced object as a hex string"""
-        warnings.warn('Use str(entry.id)', DeprecationWarning)
+        warnings.warn('Use str(entry.id)', DeprecationWarning, stacklevel=2)
         return str(self.id)
 
     def __str__(self):

diff --git a/pygit2/packbuilder.py b/pygit2/packbuilder.py
@@ -26,7 +26,7 @@
 
 # Import from pygit2
 from .errors import check_error
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .utils import to_bytes
 
 

diff --git a/pygit2/references.py b/pygit2/references.py
@@ -24,6 +24,7 @@
 # Boston, MA 02110-1301, USA.
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from .enums import ReferenceFilter

diff --git a/pygit2/refspec.py b/pygit2/refspec.py
@@ -25,7 +25,7 @@
 
 # Import from pygit2
 from .errors import check_error
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .utils import to_bytes
 
 

diff --git a/pygit2/remotes.py b/pygit2/remotes.py
@@ -24,17 +24,19 @@
 # Boston, MA 02110-1301, USA.
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
+from . import utils
+
 # Import from pygit2
 from ._pygit2 import Oid
 from .callbacks import git_fetch_options, git_push_options, git_remote_callbacks
 from .enums import FetchPrune
 from .errors import check_error
-from .ffi import ffi, C
+from .ffi import C, ffi
 from .refspec import Refspec
-from . import utils
-from .utils import maybe_string, to_bytes, strarray_to_strings, StrArray
+from .utils import StrArray, maybe_string, strarray_to_strings, to_bytes
 
 # Need BaseRepository for type hints, but don't let it cause a circular dependency
 if TYPE_CHECKING:
@@ -185,10 +187,7 @@ def ls_remotes(self, callbacks=None, proxy=None):
         for i in range(int(refs_len[0])):
             ref = refs[0][i]
             local = bool(ref.local)
-            if local:
-                loid = Oid(raw=bytes(ffi.buffer(ref.loid.id)[:]))
-            else:
-                loid = None
+            loid = Oid(raw=bytes(ffi.buffer(ref.loid.id)[:])) if local else None
 
             remote = {
                 'local': local,