diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-19 07:03:36 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-19 07:03:44 +0000 |
commit | 9262e31316a16180044e0e28a2740238f8aef5c4 (patch) | |
tree | 49b2bc070018965707ec237623da9932c880fae4 /pre_commit_hooks/file_contents_sorter.py | |
parent | Adding debian version 4.1.0-1. (diff) | |
download | pre-commit-hooks-9262e31316a16180044e0e28a2740238f8aef5c4.tar.xz pre-commit-hooks-9262e31316a16180044e0e28a2740238f8aef5c4.zip |
Merging upstream version 4.3.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'pre_commit_hooks/file_contents_sorter.py')
-rw-r--r-- | pre_commit_hooks/file_contents_sorter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pre_commit_hooks/file_contents_sorter.py b/pre_commit_hooks/file_contents_sorter.py index 392e226..c5691f0 100644 --- a/pre_commit_hooks/file_contents_sorter.py +++ b/pre_commit_hooks/file_contents_sorter.py @@ -9,12 +9,13 @@ per line. Various users are adding/removing lines from this file; using this hook on that file should reduce the instances of git merge conflicts and keep the file nicely ordered. """ +from __future__ import annotations + import argparse from typing import Any from typing import Callable from typing import IO from typing import Iterable -from typing import Optional from typing import Sequence PASS = 0 @@ -23,7 +24,7 @@ FAIL = 1 def sort_file_contents( f: IO[bytes], - key: Optional[Callable[[bytes], Any]], + key: Callable[[bytes], Any] | None, *, unique: bool = False, ) -> int: @@ -47,7 +48,7 @@ def sort_file_contents( return FAIL -def main(argv: Optional[Sequence[str]] = None) -> int: +def main(argv: Sequence[str] | None = None) -> int: parser = argparse.ArgumentParser() parser.add_argument('filenames', nargs='+', help='Files to sort') parser.add_argument( |