derivepassphrase.git

@@ -163,7 +163,7 @@ class TranslatedString:

         if isinstance(

             template, (Label, InfoMsgTemplate, WarnMsgTemplate, ErrMsgTemplate)

         ):

-            template = cast(TranslatableString, template.value)

+            template = cast('TranslatableString', template.value)

         self.template = template

         self.kwargs = {**args_dict, **kwargs}

         self._rendered: str | None = None

@@ -10,6 +10,7 @@ import collections

 import enum

 import json

 import math

+import string

 from typing import TYPE_CHECKING

 from typing_extensions import (

@@ -195,11 +196,11 @@ def json_path(path: Sequence[str | int], /) -> str:

     def needs_longhand(x: str | int) -> bool:

         initial = (

-            frozenset('abcdefghijklmnopqrstuvwxyz')

-            | frozenset('ABCDEFGHIJKLMNOPQRSTUVWXYZ')

+            frozenset(string.ascii_lowercase)

+            | frozenset(string.ascii_uppercase)

             | frozenset('_')

         )

-        chars = initial | frozenset('0123456789')

+        chars = initial | frozenset(string.digits)

         return not (

             isinstance(x, str)

             and x

@@ -413,7 +414,7 @@ def js_truthiness(value: Any, /) -> bool:  # noqa: ANN401

     """  # noqa: RUF002

     try:

-        if value in {None, False, 0, 0.0, ''}:

+        if value in {None, False, 0, 0.0, ''}:  # noqa: B033

             return False

     except TypeError:

         # All falsy values are hashable, so this can't be falsy.

@@ -2041,7 +2041,7 @@ def _prompt_for_passphrase() -> str:

     """

     return cast(

-        str,

+        'str',

         click.prompt(

             'Passphrase',

             default='',

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

         assert service is not None

         configuration = get_config()

         text = DEFAULT_NOTES_TEMPLATE + configuration['services'].get(

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

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

         ).get('notes', '')

         notes_value = click.edit(text=text)

         if notes_value is not None:

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

             # TODO(the-13th-letter): keep track of auto-close; try

             # os.dup if feasible

             infile = cast(

-                TextIO,

+                'TextIO',

                 (

                     import_settings

                     if hasattr(import_settings, 'close')

@@ -3167,14 +3167,14 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

         try:

             _check_for_misleading_passphrase(

                 ('global',),

-                cast(dict[str, Any], maybe_config.get('global', {})),

+                cast('dict[str, Any]', maybe_config.get('global', {})),

                 main_config=user_config,

                 ctx=ctx,

             )

             for key, value in maybe_config['services'].items():

                 _check_for_misleading_passphrase(

                     ('services', key),

-                    cast(dict[str, Any], value),

+                    cast('dict[str, Any]', value),

                     main_config=user_config,

                     ctx=ctx,

                 )

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

             # TODO(the-13th-letter): keep track of auto-close; try

             # os.dup if feasible

             outfile = cast(

-                TextIO,

+                'TextIO',

                 (

                     export_settings

                     if hasattr(export_settings, 'close')

@@ -3308,10 +3308,10 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

                 if k in service_keys and v is not None

             },

             cast(

-                dict[str, Any],

+                'dict[str, Any]',

                 configuration['services'].get(service, {}) if service else {},

             ),

-            cast(dict[str, Any], configuration.get('global', {})),

+            cast('dict[str, Any]', configuration.get('global', {})),

         )

         if not store_config_only and not service:

             err_msg = _msg.TranslatedString(

@@ -253,7 +253,7 @@ class Vault:

             raise ValueError(msg)

         # Ensure the bound is strictly positive.

         entropy_bound = max(1, self._entropy())

-        return int(math.ceil(safety_factor * entropy_bound / 8))

+        return math.ceil(safety_factor * entropy_bound / 8)

     @staticmethod

     def _get_binary_string(s: bytes | bytearray | str, /) -> bytes:

@@ -97,7 +97,7 @@ class Test001ExporterUtils:

     ) -> None:

         monkeypatch.setattr(os.path, 'expanduser', lambda x: x)

         with pytest.raises(

-            RuntimeError, match='[Cc]annot determine home directory'

+            RuntimeError, match=r'[Cc]annot determine home directory'

         ):

             exporter.get_vault_path()

@@ -659,7 +659,8 @@ class TestAgentInteraction:

             client = stack.enter_context(ssh_agent.SSHAgentClient())

             monkeypatch2.setattr(client, 'request', request)

             with pytest.raises(

-                RuntimeError, match='Malformed response|does not match request'

+                RuntimeError,

+                match=r'Malformed response|does not match request',

             ):

                 client.query_extensions()