From 767617d21ca65cf9b4b46f49969e16251ef5ea65 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Wed, 4 Dec 2024 18:14:23 +0200 Subject: [PATCH] FIXUP: Formatting --- dangerzone/container_utils.py | 30 ++++++++++++---------- dangerzone/isolation_provider/container.py | 4 ++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dangerzone/container_utils.py b/dangerzone/container_utils.py index 5f9172e..66d25b5 100644 --- a/dangerzone/container_utils.py +++ b/dangerzone/container_utils.py @@ -5,8 +5,8 @@ import shutil import subprocess from typing import List, Tuple -from .util import get_resource_path, get_subprocess_startupinfo from . import errors +from .util import get_resource_path, get_subprocess_startupinfo CONTAINER_NAME = "dangerzone.rocks/dangerzone" @@ -78,18 +78,22 @@ def list_image_tags() -> List[str]: images. This can be useful when we want to find which are the local image tags, and which image ID does the "latest" tag point to. """ - return subprocess.check_output( - [ - get_runtime(), - "image", - "list", - "--format", - "{{ .Tag }}", - CONTAINER_NAME, - ], - text=True, - startupinfo=get_subprocess_startupinfo(), - ).strip().split() + return ( + subprocess.check_output( + [ + get_runtime(), + "image", + "list", + "--format", + "{{ .Tag }}", + CONTAINER_NAME, + ], + text=True, + startupinfo=get_subprocess_startupinfo(), + ) + .strip() + .split() + ) def delete_image_tag(tag: str) -> None: diff --git a/dangerzone/isolation_provider/container.py b/dangerzone/isolation_provider/container.py index e757c4a..1a08385 100644 --- a/dangerzone/isolation_provider/container.py +++ b/dangerzone/isolation_provider/container.py @@ -171,7 +171,9 @@ class Container(IsolationProvider): enable_stdin = ["-i"] set_name = ["--name", name] prevent_leakage_args = ["--rm"] - image_name = [container_utils.CONTAINER_NAME + ":" + container_utils.get_expected_tag()] + image_name = [ + container_utils.CONTAINER_NAME + ":" + container_utils.get_expected_tag() + ] args = ( ["run"] + security_args