almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-08 22:41:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix typing for container_utils and main_windows

Browse source
This commit is contained in:
Alexis Métaireau 2025-05-05 12:31:32 +02:00
parent 1ce9613482
commit 7045525293
No known key found for this signature in database
GPG key ID: C65C7A89A8FFC56E
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dangerzone/container_utils.py
View file

@ -5,7 +5,7 @@ import platform
import shutil import shutil
import subprocess import subprocess
from pathlib import Path from pathlib import Path
from typing import IO, Callable, List, Optional, Tuple from typing import IO, Callable, Iterable, List, Optional, Tuple
from . import errors from . import errors
from .settings import Settings from .settings import Settings
@ -86,7 +86,7 @@ def get_runtime_version(runtime: Optional[Runtime] = None) -> Tuple[int, int]:
cmd, cmd,
capture_output=True, capture_output=True,
check=True, check=True,
).stdout.decode() ).stdout.decode() # type:ignore[attr-defined]
except Exception as e: except Exception as e:
msg = f"Could not get the version of the {runtime.name.capitalize()} tool: {e}" msg = f"Could not get the version of the {runtime.name.capitalize()} tool: {e}"
raise RuntimeError(msg) from e raise RuntimeError(msg) from e
@ -142,7 +142,7 @@ def add_image_tag(image_id: str, new_tag: str) -> None:
def delete_image_digests( def delete_image_digests(
digests: List[str], container_name: Optional[str] = None digests: Iterable[str], container_name: Optional[str] = None
) -> None: ) -> None:
"""Delete a Dangerzone image by its id.""" """Delete a Dangerzone image by its id."""
container_name = container_name or expected_image_name() container_name = container_name or expected_image_name()
@ -242,7 +242,7 @@ def get_image_id_by_digest(digest: str) -> str:
log.debug(" ".join(cmd)) log.debug(" ".join(cmd))
process = subprocess_run(cmd, check=True, capture_output=True) process = subprocess_run(cmd, check=True, capture_output=True)
# In case we have multiple lines, we only want the first one. # In case we have multiple lines, we only want the first one.
return process.stdout.decode().strip().split("\n")[0] return process.stdout.decode().strip().split("\n")[0] # type:ignore[attr-defined]
def expected_image_name() -> str: def expected_image_name() -> str:
@ -292,7 +292,7 @@ def get_local_image_digest(image: Optional[str] = None) -> str:
capture_output=True, capture_output=True,
check=True, check=True,
) )
lines = result.stdout.decode().strip().split("\n") lines = result.stdout.decode().strip().split("\n") # type:ignore[attr-defined]
if len(lines) != 1: if len(lines) != 1:
raise errors.MultipleImagesFoundException( raise errors.MultipleImagesFoundException(
f"Expected a single line of output, got {len(lines)} lines" f"Expected a single line of output, got {len(lines)} lines"

2
dangerzone/gui/main_window.py
View file

@ -529,7 +529,7 @@ class WaitingWidgetContainer(WaitingWidget):
# - "install_container" # - "install_container"
def _create_button( def _create_button(
self, label: str, event: QtCore.Signal, hide: bool = False self, label: str, event: Callable, hide: bool = False
) -> QtWidgets.QWidget: ) -> QtWidgets.QWidget:
button = QtWidgets.QPushButton(label) button = QtWidgets.QPushButton(label)
button.clicked.connect(event) button.clicked.connect(event)