From a0330d578ef223d02d6c5fcd39e2b60bd375b3d1 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 1 Feb 2023 12:30:37 +0100 Subject: [PATCH] run black 23.1.0 on the code --- src/borg/archive.py | 2 +- src/borg/archiver/benchmark_cmd.py | 1 - src/borg/archiver/check_cmd.py | 1 - src/borg/archiver/compact_cmd.py | 1 - src/borg/archiver/config_cmd.py | 1 - src/borg/archiver/debug_cmd.py | 1 - src/borg/archiver/diff_cmd.py | 1 - src/borg/archiver/extract_cmd.py | 1 - src/borg/archiver/key_cmds.py | 1 - src/borg/archiver/lock_cmds.py | 1 - src/borg/archiver/prune_cmd.py | 1 - src/borg/archiver/rdelete_cmd.py | 1 - src/borg/archiver/tar_cmds.py | 1 - src/borg/archiver/transfer_cmd.py | 1 - src/borg/patterns.py | 2 +- src/borg/testsuite/archiver/tar_cmds.py | 1 - src/borg/testsuite/benchmark.py | 1 - src/borg/testsuite/chunker.py | 1 + src/borg/testsuite/hashindex.py | 1 - 19 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 0600093df..94644c99c 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -1054,7 +1054,7 @@ Duration: {0.duration} pi = ProgressIndicatorPercent( total=len(items_ids), msg="Decrementing references %3.0f%%", msgid="archive.delete" ) - for (i, (items_id, data)) in enumerate(zip(items_ids, self.repository.get_many(items_ids))): + for i, (items_id, data) in enumerate(zip(items_ids, self.repository.get_many(items_ids))): if progress: pi.show(i) _, data = self.repo_objs.parse(items_id, data) diff --git a/src/borg/archiver/benchmark_cmd.py b/src/borg/archiver/benchmark_cmd.py index 3ce6108c7..e3d16448c 100644 --- a/src/borg/archiver/benchmark_cmd.py +++ b/src/borg/archiver/benchmark_cmd.py @@ -217,7 +217,6 @@ class BenchmarkMixIn: return 0 def build_parser_benchmarks(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog benchmark_epilog = process_epilog("These commands do various benchmarks.") diff --git a/src/borg/archiver/check_cmd.py b/src/borg/archiver/check_cmd.py index d366513e5..04fc0ee14 100644 --- a/src/borg/archiver/check_cmd.py +++ b/src/borg/archiver/check_cmd.py @@ -66,7 +66,6 @@ class CheckMixIn: return EXIT_SUCCESS def build_parser_check(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog from ._common import define_archive_filters_group diff --git a/src/borg/archiver/compact_cmd.py b/src/borg/archiver/compact_cmd.py index 08193cdfe..e7960ace7 100644 --- a/src/borg/archiver/compact_cmd.py +++ b/src/borg/archiver/compact_cmd.py @@ -22,7 +22,6 @@ class CompactMixIn: return EXIT_SUCCESS def build_parser_compact(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog compact_epilog = process_epilog( diff --git a/src/borg/archiver/config_cmd.py b/src/borg/archiver/config_cmd.py index c8142112b..b2ee5276c 100644 --- a/src/borg/archiver/config_cmd.py +++ b/src/borg/archiver/config_cmd.py @@ -150,7 +150,6 @@ class ConfigMixIn: cache.close() def build_parser_config(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog config_epilog = process_epilog( diff --git a/src/borg/archiver/debug_cmd.py b/src/borg/archiver/debug_cmd.py index f2534ba63..d97b0ee2d 100644 --- a/src/borg/archiver/debug_cmd.py +++ b/src/borg/archiver/debug_cmd.py @@ -330,7 +330,6 @@ class DebugMixIn: return EXIT_SUCCESS def build_parser_debug(self, subparsers, common_parser, mid_common_parser): - debug_epilog = process_epilog( """ These commands are not intended for normal use and potentially very diff --git a/src/borg/archiver/diff_cmd.py b/src/borg/archiver/diff_cmd.py index dd69d8a55..c24908823 100644 --- a/src/borg/archiver/diff_cmd.py +++ b/src/borg/archiver/diff_cmd.py @@ -58,7 +58,6 @@ class DiffMixIn: return self.exit_code def build_parser_diff(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog from ._common import define_exclusion_group diff --git a/src/borg/archiver/extract_cmd.py b/src/borg/archiver/extract_cmd.py index 97344b8e5..a3fed094e 100644 --- a/src/borg/archiver/extract_cmd.py +++ b/src/borg/archiver/extract_cmd.py @@ -109,7 +109,6 @@ class ExtractMixIn: return self.exit_code def build_parser_extract(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog from ._common import define_exclusion_group diff --git a/src/borg/archiver/key_cmds.py b/src/borg/archiver/key_cmds.py index 96dec5cce..a365848ff 100644 --- a/src/borg/archiver/key_cmds.py +++ b/src/borg/archiver/key_cmds.py @@ -132,7 +132,6 @@ class KeysMixIn: return EXIT_SUCCESS def build_parser_keys(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog subparser = subparsers.add_parser( diff --git a/src/borg/archiver/lock_cmds.py b/src/borg/archiver/lock_cmds.py index d27763ac6..9cf11c0c5 100644 --- a/src/borg/archiver/lock_cmds.py +++ b/src/borg/archiver/lock_cmds.py @@ -51,7 +51,6 @@ class LocksMixIn: return self.exit_code def build_parser_locks(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog break_lock_epilog = process_epilog( diff --git a/src/borg/archiver/prune_cmd.py b/src/borg/archiver/prune_cmd.py index 7d0d66571..e7c5d6b0c 100644 --- a/src/borg/archiver/prune_cmd.py +++ b/src/borg/archiver/prune_cmd.py @@ -170,7 +170,6 @@ class PruneMixIn: return self.exit_code def build_parser_prune(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog from ._common import define_archive_filters_group diff --git a/src/borg/archiver/rdelete_cmd.py b/src/borg/archiver/rdelete_cmd.py index 1321eef22..40ccbc725 100644 --- a/src/borg/archiver/rdelete_cmd.py +++ b/src/borg/archiver/rdelete_cmd.py @@ -90,7 +90,6 @@ class RDeleteMixIn: return self.exit_code def build_parser_rdelete(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog rdelete_epilog = process_epilog( diff --git a/src/borg/archiver/tar_cmds.py b/src/borg/archiver/tar_cmds.py index 95196e118..fd0093743 100644 --- a/src/borg/archiver/tar_cmds.py +++ b/src/borg/archiver/tar_cmds.py @@ -331,7 +331,6 @@ class TarMixIn: log_multi(str(archive), str(archive.stats), logger=logging.getLogger("borg.output.stats")) def build_parser_tar(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog export_tar_epilog = process_epilog( diff --git a/src/borg/archiver/transfer_cmd.py b/src/borg/archiver/transfer_cmd.py index d9ee4f641..731031622 100644 --- a/src/borg/archiver/transfer_cmd.py +++ b/src/borg/archiver/transfer_cmd.py @@ -142,7 +142,6 @@ class TransferMixIn: return EXIT_SUCCESS def build_parser_transfer(self, subparsers, common_parser, mid_common_parser): - from ._common import process_epilog from ._common import define_archive_filters_group diff --git a/src/borg/patterns.py b/src/borg/patterns.py index e994bc4e1..7d0941992 100644 --- a/src/borg/patterns.py +++ b/src/borg/patterns.py @@ -151,7 +151,7 @@ class PatternMatcher: return self.is_include_cmd[value] # this is the slow way, if we have many patterns in self._items: - for (pattern, cmd) in self._items: + for pattern, cmd in self._items: if pattern.match(path, normalize=False): self.recurse_dir = pattern.recurse_dir return self.is_include_cmd[cmd] diff --git a/src/borg/testsuite/archiver/tar_cmds.py b/src/borg/testsuite/archiver/tar_cmds.py index caf890d09..b1228f5bd 100644 --- a/src/borg/testsuite/archiver/tar_cmds.py +++ b/src/borg/testsuite/archiver/tar_cmds.py @@ -26,7 +26,6 @@ def have_gnutar(): class ArchiverTestCase(ArchiverTestCaseBase): - requires_gnutar = pytest.mark.skipif(not have_gnutar(), reason="GNU tar must be installed for this test.") requires_gzip = pytest.mark.skipif(not shutil.which("gzip"), reason="gzip must be installed for this test.") diff --git a/src/borg/testsuite/benchmark.py b/src/borg/testsuite/benchmark.py index bb9d20548..aaea5e3d7 100644 --- a/src/borg/testsuite/benchmark.py +++ b/src/borg/testsuite/benchmark.py @@ -113,7 +113,6 @@ def test_help(benchmark, cmd): @pytest.mark.parametrize("type, key, value", [(Item, "size", 1000), (Item, "mode", 0x777), (Item, "deleted", False)]) def test_propdict_attributes(benchmark, type, key, value): - propdict = type() def getattr_setattr(item, key, value): diff --git a/src/borg/testsuite/chunker.py b/src/borg/testsuite/chunker.py index 54aade3ea..c065a9a70 100644 --- a/src/borg/testsuite/chunker.py +++ b/src/borg/testsuite/chunker.py @@ -10,6 +10,7 @@ from . import BaseTestCase def cf(chunks): """chunk filter""" + # this is to simplify testing: either return the data piece (bytes) or the hole length (int). def _cf(chunk): if chunk.meta["allocation"] == CH_DATA: diff --git a/src/borg/testsuite/hashindex.py b/src/borg/testsuite/hashindex.py index ce285bcd3..00e8a26d0 100644 --- a/src/borg/testsuite/hashindex.py +++ b/src/borg/testsuite/hashindex.py @@ -601,7 +601,6 @@ class AllIndexTestCase(BaseTestCase): class IndexCorruptionTestCase(BaseTestCase): def test_bug_4829(self): - from struct import pack def HH(x, y, z):