Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: import CalledProcessError for users of run_command (no merge, nl) #62

Merged
merged 8 commits into from
Mar 5, 2024
Merged

feat: import CalledProcessError for users of run_command (no merge, nl) #62

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
069a920
refactor: replace `check_call` with `run_command`
Mar 3, 2024
3618162
feat: import `CalledProcessError` for users of `run_command`
Mar 3, 2024
5a617b3
refactor: use `run_command` in `Command`
Mar 3, 2024
cc64c16
Merge pull request #63 from adfinis/jlf/chore-use-run_command-in-Command
Mar 4, 2024
479d431
Merge pull request #64 from adfinis/jlf/chore-replace-check_call-with…
Mar 4, 2024
2741bdb
refactor: replace `call_output` with `run_command`
Mar 3, 2024
0b2002f
chore: switch to toml
Mar 3, 2024
8e79657
Merge pull request #65 from adfinis/jlf/refactor-replace-call_output-…
Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyaptly/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import logging
import subprocess
from pathlib import Path
from subprocess import DEVNULL, PIPE # noqa: F401
from typing import Optional, Union
from subprocess import DEVNULL, PIPE, CalledProcessError # noqa: F401
from typing import Optional, Sequence

_DEFAULT_KEYSERVER: str = "hkps://keys.openpgp.org"
_PYTEST_KEYSERVER: Optional[str] = None
Expand Down Expand Up @@ -51,7 +51,7 @@ def is_debug_mode():
return _DEBUG or _PYTEST_DEBUG


def run_command(cmd_args: list[Union[str, Path]], *, decode: bool = True, **kwargs):
def run_command(cmd_args: Sequence[str | Path], *, decode: bool = True, **kwargs):
"""Instrumented subprocess.run for easier debugging.

By default this run command will add `encoding="UTF-8"` to kwargs. Disable
Expand Down Expand Up @@ -83,7 +83,7 @@ def run_command(cmd_args: list[Union[str, Path]], *, decode: bool = True, **kwar
return result


def indent_out(output: Union[bytes, str]) -> str:
def indent_out(output: bytes | str) -> str:
"""Indent command output for nicer logging-messages.

It will convert bytes to strings if need or display the result as bytes if
Expand Down
Loading