ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-17 04:18:42 +00:00
Code Packages Projects Releases Wiki Activity

Remove superfluous conversions/assignments.

Browse Source
This commit is contained in:
Felix Fontein 2025-11-16 12:02:47 +01:00
parent e42423b949
commit 7cb2bacf05
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/connection/docker_api.py
View File

@ -284,9 +284,7 @@ class Connection(ConnectionBase):
f"Non-string {what.lower()} found for extra_env option. Ambiguous env options must be " f"Non-string {what.lower()} found for extra_env option. Ambiguous env options must be "
f"wrapped in quotes to avoid them being interpreted. {what}: {val!r}" f"wrapped in quotes to avoid them being interpreted. {what}: {val!r}"
) )
kk = to_text(k, errors="surrogate_or_strict") data["Env"].append(f"{k}={v}")
vv = to_text(v, errors="surrogate_or_strict")
data["Env"].append(f"{kk}={vv}")
if self.get_option("working_dir") is not None: if self.get_option("working_dir") is not None:
data["WorkingDir"] = self.get_option("working_dir") data["WorkingDir"] = self.get_option("working_dir")

3
plugins/modules/docker_compose_v2_exec.py
View File

@ -210,13 +210,12 @@ class ExecManager(BaseComposeManager):
self.stdin += "\n" self.stdin += "\n"
if self.env is not None: if self.env is not None:
for name, value in list(self.env.items()): for name, value in self.env.items():
if not isinstance(value, str): if not isinstance(value, str):
self.fail( self.fail(
"Non-string value found for env option. Ambiguous env options must be " "Non-string value found for env option. Ambiguous env options must be "
f"wrapped in quotes to avoid them being interpreted. Key: {name}" f"wrapped in quotes to avoid them being interpreted. Key: {name}"
) )
self.env[name] = to_text(value, errors="surrogate_or_strict")
def get_exec_cmd(self, dry_run: bool) -> list[str]: def get_exec_cmd(self, dry_run: bool) -> list[str]:
args = self.get_base_args(plain_progress=True) + ["exec"] args = self.get_base_args(plain_progress=True) + ["exec"]

3
plugins/modules/docker_compose_v2_run.py
View File

@ -296,13 +296,12 @@ class ExecManager(BaseComposeManager):
self.stdin += "\n" self.stdin += "\n"
if self.env is not None: if self.env is not None:
for name, value in list(self.env.items()): for name, value in self.env.items():
if not isinstance(value, str): if not isinstance(value, str):
self.fail( self.fail(
"Non-string value found for env option. Ambiguous env options must be " "Non-string value found for env option. Ambiguous env options must be "
f"wrapped in quotes to avoid them being interpreted. Key: {name}" f"wrapped in quotes to avoid them being interpreted. Key: {name}"
) )
self.env[name] = to_text(value, errors="surrogate_or_strict")
def get_run_cmd(self, dry_run: bool) -> list[str]: def get_run_cmd(self, dry_run: bool) -> list[str]:
args = self.get_base_args(plain_progress=True) + ["run"] args = self.get_base_args(plain_progress=True) + ["run"]

5
plugins/modules/docker_container_exec.py
View File

@ -221,16 +221,15 @@ def main() -> None:
stdin: str | None = client.module.params["stdin"] stdin: str | None = client.module.params["stdin"]
strip_empty_ends: bool = client.module.params["strip_empty_ends"] strip_empty_ends: bool = client.module.params["strip_empty_ends"]
tty: bool = client.module.params["tty"] tty: bool = client.module.params["tty"]
env: dict[str, t.Any] = client.module.params["env"] env: dict[str, t.Any] | None = client.module.params["env"]
if env is not None: if env is not None:
for name, value in list(env.items()): for name, value in env.items():
if not isinstance(value, str): if not isinstance(value, str):
client.module.fail_json( client.module.fail_json(
msg="Non-string value found for env option. Ambiguous env options must be " msg="Non-string value found for env option. Ambiguous env options must be "
f"wrapped in quotes to avoid them being interpreted. Key: {name}" f"wrapped in quotes to avoid them being interpreted. Key: {name}"
) )
env[name] = to_text(value, errors="surrogate_or_strict")
if command is not None: if command is not None:
argv = shlex.split(command) argv = shlex.split(command)