From 38006e0d47c685ae44c67d93b7848008b5ea6187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vykintas=20Baltru=C5=A1aitis?= Date: Mon, 20 Nov 2023 09:21:26 +0200 Subject: [PATCH] Run formatter --- b2/console_tool.py | 8 +++++--- test/integration/test_b2_command_line.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/b2/console_tool.py b/b2/console_tool.py index 5e1876f90..a1d9db12c 100644 --- a/b2/console_tool.py +++ b/b2/console_tool.py @@ -37,7 +37,7 @@ from concurrent.futures import Executor, Future, ThreadPoolExecutor from contextlib import suppress from enum import Enum -from typing import Any, BinaryIO, Callable, Dict, List, Optional, Tuple +from typing import Any, BinaryIO, Dict, List, Optional, Tuple import argcomplete import b2sdk @@ -423,7 +423,8 @@ def _setup_parser(cls, parser: argparse.ArgumentParser) -> None: ) super()._setup_parser(parser) - def _file_info_with_header_args(self, args, file_info: dict[str, str] | None) -> dict[str, str] | None: + def _file_info_with_header_args(self, args, + file_info: dict[str, str] | None) -> dict[str, str] | None: """Construct an updated file_info dictionary. Print a warning if any of file_info items will be overwritten by explicit header arguments. """ @@ -1072,7 +1073,8 @@ def run(self, args): @B2.register_subcommand class CopyFileById( - HeaderFlagsMixin, DestinationSseMixin, SourceSseMixin, FileRetentionSettingMixin, LegalHoldMixin, Command + HeaderFlagsMixin, DestinationSseMixin, SourceSseMixin, FileRetentionSettingMixin, + LegalHoldMixin, Command ): """ Copy a file version to the given bucket (server-side, **not** via download+upload). diff --git a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py index 08a26dfab..e62e359d3 100755 --- a/test/integration/test_b2_command_line.py +++ b/test/integration/test_b2_command_line.py @@ -2723,7 +2723,8 @@ def assert_expected(file_info, expected=expected_file_info): str(sample_filepath), 'sample_file', *args, - '--info', 'b2-content-disposition=will-be-overwritten', + '--info', + 'b2-content-disposition=will-be-overwritten', ] ) assert status == 0 @@ -2734,7 +2735,6 @@ def assert_expected(file_info, expected=expected_file_info): # a warning should be emitted assert 'will be overwritten' in stderr and 'b2-content-disposition = attachment' in stderr - copied_version = b2_tool.should_succeed_json( [ 'copy-file-by-id', '--quiet', *args, '--contentType', 'text/plain',