derivepassphrase.git

@@ -239,9 +239,7 @@ def load_config() -> _types.VaultConfig:

 # TODO(the-13th-letter): Remove this function.

 # https://the13thletter.info/derivepassphrase/latest/upgrade-notes.html#v1.0-old-settings-file

-def migrate_and_load_old_config() -> tuple[

-    _types.VaultConfig, OSError | None

-]:

+def migrate_and_load_old_config() -> tuple[_types.VaultConfig, OSError | None]:

     """Load and migrate a vault(1)-compatible config.

     The (old) filename is obtained via [`config_filename`][].  This

@@ -297,9 +297,7 @@ class _VaultConfigValidator:

             if key in {'key', 'phrase'}:

                 if not isinstance(value, str):

                     raise TypeError(err_not_a_string.format(**kwargs))

-            elif key == 'unicode_normalization_form' and path == (

-                'global',

-            ):

+            elif key == 'unicode_normalization_form' and path == ('global',):

                 if not isinstance(value, str):

                     raise TypeError(err_not_a_string.format(**kwargs))

                 if not allow_unknown_settings:

@@ -385,9 +383,7 @@ class _VaultConfigValidator:

                 )

                 service_obj[key] = 20

             elif key == 'repeat' and falsy_but_not_zero(value):

-                yield CleanupStep(

-                    (*path, key), service_obj[key], 'replace', 0

-                )

+                yield CleanupStep((*path, key), service_obj[key], 'replace', 0)

                 service_obj[key] = 0

             elif key in {

                 'lower',

@@ -812,7 +812,9 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

                 backup_config, exc = cli_helpers.migrate_and_load_old_config()

             except FileNotFoundError:

                 return {'services': {}}

-            old_name = cli_helpers.config_filename(subsystem='old settings.json').name

+            old_name = cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).name

             new_name = cli_helpers.config_filename(subsystem='vault').name

             deprecation.warning(

                 _msg.TranslatedString(

@@ -906,19 +908,33 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

     configuration: _types.VaultConfig

     check_incompatible_options('--phrase', '--key')

-    for group in (cli_machinery.ConfigurationOption, cli_machinery.StorageManagementOption):

+    for group in (

+        cli_machinery.ConfigurationOption,

+        cli_machinery.StorageManagementOption,

+    ):

         for opt in options_in_group[group]:

             if opt != params_by_str['--config']:

-                for other_opt in options_in_group[cli_machinery.PassphraseGenerationOption]:

+                for other_opt in options_in_group[

+                    cli_machinery.PassphraseGenerationOption

+                ]:

                     check_incompatible_options(opt, other_opt)

-    for group in (cli_machinery.ConfigurationOption, cli_machinery.StorageManagementOption):

+    for group in (

+        cli_machinery.ConfigurationOption,

+        cli_machinery.StorageManagementOption,

+    ):

         for opt in options_in_group[group]:

-            for other_opt in options_in_group[cli_machinery.ConfigurationOption]:

+            for other_opt in options_in_group[

+                cli_machinery.ConfigurationOption

+            ]:

                 check_incompatible_options(opt, other_opt)

-            for other_opt in options_in_group[cli_machinery.StorageManagementOption]:

+            for other_opt in options_in_group[

+                cli_machinery.StorageManagementOption

+            ]:

                 check_incompatible_options(opt, other_opt)

-    sv_or_global_options = options_in_group[cli_machinery.PassphraseGenerationOption]

+    sv_or_global_options = options_in_group[

+        cli_machinery.PassphraseGenerationOption

+    ]

     for param in sv_or_global_options:

         if is_param_set(param) and not (

             service is not None or is_param_set(params_by_str['--config'])

@@ -972,11 +988,15 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

         notes_marker = _msg.TranslatedString(

             _msg.Label.DERIVEPASSPHRASE_VAULT_NOTES_MARKER

         )

-        old_notes_value = configuration['services'].get(

-            service, cast('_types.VaultConfigServicesSettings', {})

-        ).get('notes', '')

+        old_notes_value = (

+            configuration['services']

+            .get(service, cast('_types.VaultConfigServicesSettings', {}))

+            .get('notes', '')

+        )

         text = '\n'.join([

-            str(notes_instructions), str(notes_marker), old_notes_value

+            str(notes_instructions),

+            str(notes_marker),

+            old_notes_value,

         ])

         notes_value = click.edit(text=text)

         if notes_value is not None:

@@ -34,8 +34,8 @@ import pathlib

 import struct

 from typing import TYPE_CHECKING, Any

-from derivepassphrase._internals import cli_messages as _msg

 from derivepassphrase import _types, exporter

+from derivepassphrase._internals import cli_messages as _msg

 if TYPE_CHECKING:

     from collections.abc import Iterator

@@ -35,8 +35,8 @@ import pathlib

 import warnings

 from typing import TYPE_CHECKING

-from derivepassphrase._internals import cli_messages as _msg

 from derivepassphrase import exporter, vault

+from derivepassphrase._internals import cli_messages as _msg

 if TYPE_CHECKING:

     from typing import Any

@@ -1113,7 +1113,10 @@ class TestCLI:

                     tests.isolated_vault_config(

                         monkeypatch=monkeypatch,

                         runner=runner,

-                        vault_config={'global': {'phrase': 'abc'}, 'services': {}},

+                        vault_config={

+                            'global': {'phrase': 'abc'},

+                            'services': {},

+                        },

                     )

                 )

                 monkeypatch.setattr(

@@ -1447,7 +1450,9 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='vault').unlink(missing_ok=True)

+            cli_helpers.config_filename(subsystem='vault').unlink(

+                missing_ok=True

+            )

             result_ = runner.invoke(

                 # Test parent context navigation by not calling

                 # `cli.derivepassphrase_vault` directly.  Used e.g. in

@@ -2329,7 +2334,9 @@ contents go here

                 monkeypatch.setattr(cli_helpers, 'save_config', save_config_)

                 return save_config_(*args, **kwargs)

-            monkeypatch.setattr(cli_helpers, 'save_config', obstruct_config_saving)

+            monkeypatch.setattr(

+                cli_helpers, 'save_config', obstruct_config_saving

+            )

             result_ = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--config', '-p'],

@@ -2996,7 +3003,9 @@ Boo.

         actually emits to standard error.

         """

-        warnings_cm = cli_machinery.StandardCLILogging.ensure_standard_warnings_logging()

+        warnings_cm = (

+            cli_machinery.StandardCLILogging.ensure_standard_warnings_logging()

+        )

         THE_FUTURE = 'the future will be here sooner than you think'  # noqa: N806

         JUST_TESTING = 'just testing whether warnings work'  # noqa: N806

         with warnings_cm:

@@ -3549,9 +3558,9 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

-                json.dumps(config, indent=2) + '\n', encoding='UTF-8'

-            )

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

             assert cli_helpers.migrate_and_load_old_config()[0] == config

     @pytest.mark.parametrize(

@@ -3590,9 +3599,9 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

-                json.dumps(config, indent=2) + '\n', encoding='UTF-8'

-            )

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

             assert cli_helpers.migrate_and_load_old_config() == (config, None)

     @pytest.mark.parametrize(

@@ -3631,9 +3640,9 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

-                json.dumps(config, indent=2) + '\n', encoding='UTF-8'

-            )

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

             cli_helpers.config_filename(subsystem='vault').mkdir(

                 parents=True, exist_ok=True

             )

@@ -3678,10 +3687,12 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

-                json.dumps(config, indent=2) + '\n', encoding='UTF-8'

-            )

-            with pytest.raises(ValueError, match=cli_helpers.INVALID_VAULT_CONFIG):

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

+            with pytest.raises(

+                ValueError, match=cli_helpers.INVALID_VAULT_CONFIG

+            ):

                 cli_helpers.migrate_and_load_old_config()

     def test_200_forward_export_vault_path_parameter(

@@ -3849,7 +3860,9 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(

                 json.dumps(

                     {'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},

                     indent=2,

@@ -3888,7 +3901,9 @@ class TestCLITransition:

                     runner=runner,

                 )

             )

-            cli_helpers.config_filename(subsystem='old settings.json').write_text(

+            cli_helpers.config_filename(

+                subsystem='old settings.json'

+            ).write_text(

                 json.dumps(

                     {'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},

                     indent=2,

@@ -3938,7 +3953,9 @@ class TestCLITransition:

                     vault_config=config,

                 )

             )

-            old_name = cli_helpers.config_filename(subsystem='old settings.json')

+            old_name = cli_helpers.config_filename(

+                subsystem='old settings.json'

+            )

             new_name = cli_helpers.config_filename(subsystem='vault')

             old_name.unlink(missing_ok=True)

             new_name.rename(old_name)

@@ -5194,7 +5211,9 @@ class TestShellCompletion:

                     },

                 )

             )

-            cli_helpers.config_filename(subsystem='vault').unlink(missing_ok=True)

+            cli_helpers.config_filename(subsystem='vault').unlink(

+                missing_ok=True

+            )

             assert not cli_helpers.shell_complete_service(

                 click.Context(cli.derivepassphrase),

                 click.Argument(['some_parameter']),

@@ -21,7 +21,7 @@ from hypothesis import strategies

 import tests

 from derivepassphrase import _types, ssh_agent, vault

-from derivepassphrase._internals import cli_helpers, cli_machinery

+from derivepassphrase._internals import cli_helpers

 if TYPE_CHECKING:

     from collections.abc import Iterable