blacken src

Author: ThomasWaldmann

src/borg/archiver/__init__.py

@@ -65,9 +65,6 @@
 PURE_PYTHON_MSGPACK_WARNING = "Using a pure-python msgpack! This will result in lower performance."
 
 
-
-
-
 from .analyze_cmd import AnalyzeMixIn
 from .benchmark_cmd import BenchmarkMixIn
 from .check_cmd import CheckMixIn

src/borg/archiver/_common.py

@@ -269,20 +269,8 @@ def process_epilog(epilog):
 
 
 def define_exclude_and_patterns(add_option, *, tag_files=False, strip_components=False):
-    add_option(
-        "--pattern-roots-internal",
-        dest="pattern_roots",
-        action="append",
-        default=[],
-        help=argparse.SUPPRESS,
-    )
-    add_option(
-        "--patterns-internal",
-        dest="patterns",
-        action="append",
-        default=[],
-        help=argparse.SUPPRESS,
-    )
+    add_option("--pattern-roots-internal", dest="pattern_roots", action="append", default=[], help=argparse.SUPPRESS)
+    add_option("--patterns-internal", dest="patterns", action="append", default=[], help=argparse.SUPPRESS)
     add_option(
         "-e",
         "--exclude",

src/borg/archiver/benchmark_cmd.py

@@ -408,7 +408,9 @@ def build_parser_benchmarks(self, subparsers, common_parser, mid_common_parser):
             epilog=bench_crud_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
         )
-        benchmark_parsers.add_subcommand("crud", subparser, help="benchmarks Borg CRUD (create, extract, update, delete).")
+        benchmark_parsers.add_subcommand(
+            "crud", subparser, help="benchmarks Borg CRUD (create, extract, update, delete)."
+        )
 
         subparser.add_argument("path", metavar="PATH", help="path where to create benchmark input data")
         subparser.add_argument("--json-lines", action="store_true", help="Format output as JSON Lines.")

src/borg/archiver/debug_cmd.py

@@ -568,6 +568,8 @@ def build_parser_debug(self, subparsers, common_parser, mid_common_parser):
             epilog=debug_convert_profile_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
         )
-        debug_parsers.add_subcommand("convert-profile", subparser, help="convert Borg profile to Python profile (debug)")
+        debug_parsers.add_subcommand(
+            "convert-profile", subparser, help="convert Borg profile to Python profile (debug)"
+        )
         subparser.add_argument("input", metavar="INPUT", type=str, help="Borg profile")
         subparser.add_argument("output", metavar="OUTPUT", type=str, help="Output file")

src/borg/archiver/help_cmd.py

@@ -555,11 +555,7 @@ def do_subcommand_help(self, parser, args):
     do_maincommand_help = do_subcommand_help
 
     def build_parser_help(self, subparsers, common_parser, mid_common_parser, parser):
-        subparser = ArgumentParser(
-            parents=[common_parser],
-            add_help=False,
-            description="Extra help",
-        )
+        subparser = ArgumentParser(parents=[common_parser], add_help=False, description="Extra help")
         subparsers.add_subcommand("help", subparser, help="Extra help")
         subparser.add_argument("--epilog-only", dest="epilog_only", action="store_true")
         subparser.add_argument("--usage-only", dest="usage_only", action="store_true")

src/borg/archiver/tag_cmd.py

@@ -89,29 +89,10 @@ def build_parser_tag(self, subparsers, common_parser, mid_common_parser):
             formatter_class=argparse.RawDescriptionHelpFormatter,
         )
         subparsers.add_subcommand("tag", subparser, help="tag archives")
+        subparser.add_argument("--set", dest="set_tags", metavar="TAG", type=tag_validator, nargs="+", help="set tags")
+        subparser.add_argument("--add", dest="add_tags", metavar="TAG", type=tag_validator, nargs="+", help="add tags")
         subparser.add_argument(
-            "--set",
-            dest="set_tags",
-            metavar="TAG",
-            type=tag_validator,
-            nargs="+",
-            help="set tags",
-        )
-        subparser.add_argument(
-            "--add",
-            dest="add_tags",
-            metavar="TAG",
-            type=tag_validator,
-            nargs="+",
-            help="add tags",
-        )
-        subparser.add_argument(
-            "--remove",
-            dest="remove_tags",
-            metavar="TAG",
-            type=tag_validator,
-            nargs="+",
-            help="remove tags",
+            "--remove", dest="remove_tags", metavar="TAG", type=tag_validator, nargs="+", help="remove tags"
         )
         define_archive_filters_group(subparser)
         subparser.add_argument(

src/borg/helpers/jap_helpers.py

@@ -11,31 +11,33 @@ def flatten_namespace(ns: Any) -> argparse.Namespace:
     internal dispatch and logic expect a flat namespace.
     """
     flat = argparse.Namespace()
-    
+
     # Extract the nested path of subcommands
     subcmds = []
     current = ns
     while current and hasattr(current, "subcommand") and current.subcommand:
         subcmds.append(current.subcommand)
         current = getattr(current, current.subcommand, None)
-        
+
     if subcmds:
         flat.subcommand = " ".join(subcmds)
-    
+
     def _flatten(source, target):
-        items = vars(source).items() if hasattr(source, '__dict__') else source.items() if hasattr(source, 'items') else []
+        items = (
+            vars(source).items() if hasattr(source, "__dict__") else source.items() if hasattr(source, "items") else []
+        )
         for k, v in items:
-            if isinstance(v, argparse.Namespace) or type(v).__name__ == 'Namespace':
+            if isinstance(v, argparse.Namespace) or type(v).__name__ == "Namespace":
                 _flatten(v, target)
             else:
                 if k != "subcommand" and not hasattr(target, k):
                     setattr(target, k, v)
-                    
+
     _flatten(ns, flat)
-    
+
     # Ensure list defaults previously handled by set_defaults are present
     for list_attr in ("paths", "patterns", "pattern_roots"):
         if getattr(flat, list_attr, None) is None:
             setattr(flat, list_attr, [])
-            
+
     return flat

src/borg/testsuite/archiver/lock_cmds_test.py

@@ -35,7 +35,11 @@ def test_with_lock(tmp_path):
     # so that lock acquisition for command2 fails as the test expects it.
     lock_wait, execution_time, startup_wait = 2, 4, 1
     assert lock_wait < execution_time - startup_wait
-    command1 = sys.executable, "-c", f'import time; print("first command - acquires the lock"); time.sleep({execution_time})'
+    command1 = (
+        sys.executable,
+        "-c",
+        f'import time; print("first command - acquires the lock"); time.sleep({execution_time})',
+    )
     command2 = sys.executable, "-c", 'print("second command - should never get executed")'
     borgwl = borg_bin, "with-lock", f"--lock-wait={lock_wait}"
     popen_options = dict(stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, env=env)

src/borg/testsuite/archiver/serve_cmd_test.py

@@ -25,6 +25,7 @@ def serve_socket(monkeypatch):
     socket_file = tempfile.mktemp(suffix=".sock", prefix="borg-", dir=get_runtime_dir())
     import sys
     import time
+
     borg_bin = os.path.join(os.path.dirname(sys.executable), "borg")
     with subprocess.Popen([borg_bin, f"--socket={socket_file}", "serve"]) as p:
         while not os.path.exists(socket_file):