derivepassphrase.git

@@ -137,6 +137,13 @@ matrix-name-format = '{variable}_{value}'

 python = ["3.13", "3.12", "3.11", "3.10", "3.9", "pypy3.10", "pypy3.9"]

 cryptography = ["no", "yes"]

 hypothesis-profile = ["user-default"]

+parser-version = ["PEG"]

+

+[[tool.hatch.envs.hatch-test.matrix]]

+python = ["3.9", "pypy3.9"]

+cryptography = ["no", "yes"]

+hypothesis-profile = ["user-default"]

+parser-version = ["LL1"]

 [[tool.hatch.envs.hatch-test.matrix]]

 cryptography = ["yes"]

@@ -149,6 +156,9 @@ matrix.cryptography.features = [

 matrix.hypothesis-profile.env-vars = [

     { key = "HYPOTHESIS_PROFILE", if = ["ci", "default", "dev", "debug"] },

 ]

+matrix.parser-version.env-vars = [

+    { key = "PYTHONOLDPARSER", value = "1", if = ["LL1"] },

+]

 [tool.hatch.envs.hatch-test.scripts]

 run = "pytest --hypothesis-profile={env:HYPOTHESIS_PROFILE:default}{env:HATCH_TEST_ARGS:} {args}"

@@ -1413,11 +1413,14 @@ def isolated_config(

 ) -> Iterator[None]:

     prog_name = cli.PROG_NAME

     env_name = prog_name.replace(' ', '_').upper() + '_PATH'

-    with (

-        runner.isolated_filesystem(),

-        cli.StandardCLILogging.ensure_standard_logging(),

-        cli.StandardCLILogging.ensure_standard_warnings_logging(),

-    ):

+    # Use parenthesized context manager expressions once Python 3.9

+    # becomes unsupported.

+    with contextlib.ExitStack() as stack:

+        stack.enter_context(runner.isolated_filesystem())

+        stack.enter_context(cli.StandardCLILogging.ensure_standard_logging())

+        stack.enter_context(

+            cli.StandardCLILogging.ensure_standard_warnings_logging()

+        )

         monkeypatch.setenv('HOME', os.getcwd())

         monkeypatch.setenv('USERPROFILE', os.getcwd())

         monkeypatch.delenv(env_name, raising=False)

@@ -1476,10 +1479,13 @@ def isolated_vault_exporter_config(

                 print(vault_config, file=outfile)

         elif isinstance(vault_config, bytes):

             os.makedirs('.vault', mode=0o700, exist_ok=True)

-            with (

-                chdir('.vault'),

-                tempfile.NamedTemporaryFile(suffix='.zip') as tmpzipfile,

-            ):

+            # Use parenthesized context manager expressions here once

+            # Python 3.9 becomes unsupported.

+            with contextlib.ExitStack() as stack:

+                stack.enter_context(chdir('.vault'))

+                tmpzipfile = stack.enter_context(

+                    tempfile.NamedTemporaryFile(suffix='.zip')

+                )

                 for line in vault_config.splitlines():

                     tmpzipfile.write(base64.standard_b64decode(line))

                 tmpzipfile.flush()

@@ -1570,12 +1570,17 @@ class TestCLIUtils:

         self, monkeypatch: pytest.MonkeyPatch

     ) -> None:

         runner = click.testing.CliRunner()

-        with (

+        # Use parenthesized context manager expressions here once Python

+        # 3.9 becomes unsupported.

+        with contextlib.ExitStack() as stack:

+            stack.enter_context(

                 tests.isolated_vault_config(

                     monkeypatch=monkeypatch, runner=runner, config={}

-            ),

-            pytest.raises(ValueError, match='Invalid vault config'),

-        ):

+                )

+            )

+            stack.enter_context(

+                pytest.raises(ValueError, match='Invalid vault config')

+            )

             cli._save_config(None)  # type: ignore[arg-type]

     def test_111_prompt_for_selection_multiple(self) -> None:

@@ -5,6 +5,7 @@

 from __future__ import annotations

 import base64

+import contextlib

 import json

 from typing import TYPE_CHECKING

@@ -265,12 +266,10 @@ class TestStoreroom:

             'signing_key': bytes(storeroom.KEY_SIZE),

             'hashing_key': bytes(storeroom.KEY_SIZE),

         }

-        with (

-            tests.isolated_vault_exporter_config(

+        with tests.isolated_vault_exporter_config(

             monkeypatch=monkeypatch,

             runner=runner,

             vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,

-            ),

         ):

             with open('.vault/20', 'w', encoding='UTF-8') as outfile:

                 print(config, file=outfile)

@@ -292,13 +291,11 @@ class TestStoreroom:

         err_msg: str,

     ) -> None:

         runner = click.testing.CliRunner(mix_stderr=False)

-        with (

-            tests.isolated_vault_exporter_config(

+        with tests.isolated_vault_exporter_config(

             monkeypatch=monkeypatch,

             runner=runner,

             vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,

             vault_key=tests.VAULT_MASTER_KEY,

-            ),

         ):

             with open('.vault/.keys', 'w', encoding='UTF-8') as outfile:

                 print(data, file=outfile)

@@ -337,15 +334,18 @@ class TestStoreroom:

         error_text: str,

     ) -> None:

         runner = click.testing.CliRunner(mix_stderr=False)

-        with (

+        # Use parenthesized context manager expressions once Python 3.9

+        # becomes unsupported.

+        with contextlib.ExitStack() as stack:

+            stack.enter_context(

                 tests.isolated_vault_exporter_config(

                     monkeypatch=monkeypatch,

                     runner=runner,

                     vault_config=zipped_config,

                     vault_key=tests.VAULT_MASTER_KEY,

-            ),

-            pytest.raises(RuntimeError, match=error_text),

-        ):

+                )

+            )

+            stack.enter_context(pytest.raises(RuntimeError, match=error_text))

             storeroom.export_storeroom_data()

     def test_404_decrypt_keys_wrong_data_length(self) -> None:

@@ -7,6 +7,7 @@

 from __future__ import annotations

 import base64

+import contextlib

 import io

 import socket

 from typing import TYPE_CHECKING

@@ -589,10 +590,11 @@ class TestAgentInteraction:

     ) -> None:

         del running_ssh_agent

-        with (

-            pytest.raises(exc_type, match=exc_pattern),

-            ssh_agent.SSHAgentClient() as client,

-        ):

+        # Use parenthesized context manager expressions once Python 3.9

+        # becomes unsupported.

+        with contextlib.ExitStack() as stack:

+            stack.enter_context(pytest.raises(exc_type, match=exc_pattern))

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

             client.request(request_code, b'', response_code=response_code)

     @pytest.mark.parametrize(

@@ -650,10 +652,11 @@ class TestAgentInteraction:

                 assert single_code in response_codes

             return response_data  # pragma: no cover

-        with (

-            monkeypatch.context() as monkeypatch2,

-            ssh_agent.SSHAgentClient() as client,

-        ):

+        # Use parenthesized context manager expressions once Python 3.9

+        # becomes unsupported.

+        with contextlib.ExitStack() as stack:

+            monkeypatch2 = stack.enter_context(monkeypatch.context())

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

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

             with pytest.raises(

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