refactor(cli[utils]): Remove _validate_choices

Author: tony

docs/api.md

@@ -49,10 +49,6 @@ If you need an internal API stabilized please [file an issue](https://github.com
 .. automethod:: tmuxp.cli.utils.get_config_dir
 ```
 
-```{eval-rst}
-.. automethod:: tmuxp.cli.utils._validate_choices
-```
-
 ```{eval-rst}
 .. automethod:: tmuxp.cli.import_config.get_teamocil_dir
 ```

src/tmuxp/cli/load.py

@@ -430,7 +430,6 @@ def load_workspace(
             )
             options = ["y", "n", "a"]
             choice = prompt_choices(msg, choices=options)
-            # value_proc=_validate_choices(options))
 
             if choice == "y":
                 _load_attached(builder, detached)
@@ -450,7 +449,6 @@ def load_workspace(
         choice = prompt_choices(
             "Error loading workspace. (k)ill, (a)ttach, (d)etach?",
             choices=["k", "a", "d"],
-            # value_proc=_validate_choices(["k", "a", "d"]),
             default="k",
         )
 

src/tmuxp/cli/utils.py

@@ -6,7 +6,7 @@
 
 from colorama import Fore
 
-from .. import config, log
+from .. import log
 from .constants import VALID_CONFIG_DIR_FILE_EXTENSIONS
 
 logger = logging.getLogger(__name__)
@@ -63,33 +63,6 @@ def get_config_dir() -> str:
     return path
 
 
-def _validate_choices(options: t.List[str]) -> t.Callable:
-    """
-    Callback wrapper for validating click.prompt input.
-
-    Parameters
-    ----------
-    options : list
-        List of allowed choices
-
-    Returns
-    -------
-    :func:`callable`
-        callback function for value_proc in :func:`click.prompt`.
-
-    Raises
-    ------
-    :class:`click.BadParameter`
-    """
-
-    def func(value):
-        if value not in options:
-            raise ValueError("Possible choices are: {}.".format(", ".join(options)))
-        return value
-
-    return func
-
-
 def get_abs_path(config: str) -> str:
     path = os.path
     join, isabs = path.join, path.isabs

tests/test_cli.py

@@ -24,7 +24,6 @@
     load_workspace,
 )
 from tmuxp.cli.utils import (
-    _validate_choices,
     get_abs_path,
     get_config_dir,
     is_pure_name,
@@ -1152,16 +1151,6 @@ def test_get_teamocil_dir(monkeypatch: pytest.MonkeyPatch) -> None:
     assert get_teamocil_dir() == os.path.expanduser("~/.teamocil/")
 
 
-def test_validate_choices() -> None:
-    validate = _validate_choices(["choice1", "choice2"])
-
-    assert validate("choice1")
-    assert validate("choice2")
-
-    with pytest.raises(ValueError):
-        assert validate("choice3")
-
-
 def test_pass_config_dir_ClickPath(
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,