From e907b0f04354873316311072da572943abb6281a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 26 Sep 2022 13:00:56 +0200 Subject: Modernize via pyupgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- utils/benchmark-verify.py | 6 +++--- utils/benchmark.py | 8 ++++---- utils/fuzzy-hash-tester.py | 4 ++-- utils/gen-test-manifest.py | 4 ++-- utils/gen_fast_manifest.py | 5 ++--- utils/gen_fast_metamanifest.py | 9 ++++----- 6 files changed, 17 insertions(+), 19 deletions(-) (limited to 'utils') diff --git a/utils/benchmark-verify.py b/utils/benchmark-verify.py index d0b2259..e2fb00f 100755 --- a/utils/benchmark-verify.py +++ b/utils/benchmark-verify.py @@ -11,13 +11,13 @@ import gemato.recursiveloader def benchmark(path): m = gemato.recursiveloader.ManifestRecursiveLoader(path) - print('load-dict: {}'.format(timeit.timeit(m.get_file_entry_dict, number=1))) - print('verify: {}'.format(timeit.timeit(m.assert_directory_verifies, number=1))) + print(f'load-dict: {timeit.timeit(m.get_file_entry_dict, number=1)}') + print(f'verify: {timeit.timeit(m.assert_directory_verifies, number=1)}') if __name__ == '__main__': if len(sys.argv) != 2: - print('Usage: {} '.format(sys.argv[0])) + print(f'Usage: {sys.argv[0]} ') sys.exit(1) benchmark(sys.argv[1]) diff --git a/utils/benchmark.py b/utils/benchmark.py index 5eb4d8d..8bca803 100755 --- a/utils/benchmark.py +++ b/utils/benchmark.py @@ -11,12 +11,12 @@ import gemato.hash def benchmark_one(path, hashes): f = lambda: gemato.hash.hash_path(path, hashes) - print("{} -> [ ".format(hashes), end='', flush=True) + print(f"{hashes} -> [ ", end='', flush=True) results = [] for t in (timeit.timeit(f, number=1) for i in range(5)): - print("{:.4}".format(t), end=" ", flush=True) + print(f"{t:.4}", end=" ", flush=True) results.append(t) - print("] -> min: {:.4}".format(min(results))) + print(f"] -> min: {min(results):.4}") def benchmark(path, hash_sets): @@ -35,7 +35,7 @@ def benchmark(path, hash_sets): if __name__ == '__main__': if len(sys.argv) < 2: - print('Usage: {} [...]'.format(sys.argv[0])) + print(f'Usage: {sys.argv[0]} [...]') sys.exit(1) benchmark(sys.argv[1], sys.argv[2:]) diff --git a/utils/fuzzy-hash-tester.py b/utils/fuzzy-hash-tester.py index 1988852..c96742b 100755 --- a/utils/fuzzy-hash-tester.py +++ b/utils/fuzzy-hash-tester.py @@ -66,14 +66,14 @@ def main(algo_name, min_size, max_size=None): print('Inconsistent hash values found!') print('Hash values:') for a, v in digests.items(): - print(' {}: {}'.format(a, v)) + print(f' {a}: {v}') print('Data block as base64:') print(base64.encodebytes(data).decode()) sys.exit(1) i += 1 if i % 1000 == 0: - print('{} blocks tested.'.format(i)) + print(f'{i} blocks tested.') if __name__ == '__main__': diff --git a/utils/gen-test-manifest.py b/utils/gen-test-manifest.py index b7c4530..33e2635 100755 --- a/utils/gen-test-manifest.py +++ b/utils/gen-test-manifest.py @@ -46,7 +46,7 @@ def write_manifest_entries_for_dir(manifest_file, topdir, hashes): def gen_metamanifests(top_dir, hashes): - with open(os.path.join(top_dir, 'profiles/categories'), 'r') as f: + with open(os.path.join(top_dir, 'profiles/categories')) as f: categories = [x.strip() for x in f] alldirs = [] @@ -73,7 +73,7 @@ def gen_metamanifests(top_dir, hashes): if __name__ == '__main__': if len(sys.argv) != 3: - print('Usage: {} '.format(sys.argv[0])) + print(f'Usage: {sys.argv[0]} ') sys.exit(1) gen_metamanifests(sys.argv[1], sys.argv[2].split()) diff --git a/utils/gen_fast_manifest.py b/utils/gen_fast_manifest.py index d7c8c51..002f8c5 100755 --- a/utils/gen_fast_manifest.py +++ b/utils/gen_fast_manifest.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# vim:fileencoding=utf-8 # Ultra-optimized Manifest writing. -# (c) 2017-2020 Michał Górny +# (c) 2017-2022 Michał Górny # Licensed under the terms of 2-clause BSD license import errno @@ -110,7 +109,7 @@ def gen_manifest(top_dir): if __name__ == '__main__': if len(sys.argv) < 2: - print('Usage: {} ...'.format(sys.argv[0])) + print(f'Usage: {sys.argv[0]} ...') sys.exit(1) for path in sys.argv[1:]: diff --git a/utils/gen_fast_metamanifest.py b/utils/gen_fast_metamanifest.py index 97368d8..0d6922d 100755 --- a/utils/gen_fast_metamanifest.py +++ b/utils/gen_fast_metamanifest.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# vim:fileencoding=utf-8 # Ultra-optimized Meta-Manifest writing. -# (c) 2017-2020 Michał Górny +# (c) 2017-2022 Michał Górny # Licensed under the terms of 2-clause BSD license import datetime @@ -19,7 +18,7 @@ import gen_fast_manifest def manifest_dir_generator(iter_n): - with open('profiles/categories', 'r') as f: + with open('profiles/categories') as f: categories = [x.strip() for x in f] for c in categories: @@ -80,7 +79,7 @@ def make_toplevel(d, ts, pgp_key): stderr=subprocess.PIPE) sout, serr = p.communicate(data) if p.wait() != 0: - raise ValueError('GPG error: {}'.format(serr)) + raise ValueError(f'GPG error: {serr}') data = sout with open(dsttop, 'wb') as f: @@ -139,7 +138,7 @@ IGNORE packages if __name__ == '__main__': if len(sys.argv) not in (2, 3): - print('Usage: {} []'.format(sys.argv[0])) + print(f'Usage: {sys.argv[0]} []') sys.exit(1) gen_metamanifest(sys.argv[1], sys.argv[2] if len(sys.argv) == 3 else None) -- cgit v1.2.3