yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SIM102: fix

Browse Source
This commit is contained in:
Jörg Thalheim
2025-08-26 15:22:25 +02:00
parent cb9c8e5b5a
commit d4bdaec586
6 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/clan-cli/clan_lib/api/type_to_jsonschema.py
View File

@@ -138,9 +138,10 @@ def type_to_dict(
if "null" not in pv["type"]:
required.add(pn)
elif pv.get("oneOf") is not None:
if "null" not in [i.get("type") for i in pv.get("oneOf", [])]:
required.add(pn)
elif pv.get("oneOf") is not None and "null" not in [
i.get("type") for i in pv.get("oneOf", [])
]:
required.add(pn)
required_fields = {
f.name

12
pkgs/clan-cli/clan_lib/errors/__init__.py
View File

@@ -67,13 +67,11 @@ def indent_command(command_list: list[str]) -> str:
arg = command_list[i]
formatted_command.append(shlex.quote(arg))
if i < len(command_list) - 1:
# Check if the current argument is an option
if arg.startswith("-"):
# Indent after the next argument
formatted_command.append(" ")
i += 1
formatted_command.append(shlex.quote(command_list[i]))
if i < len(command_list) - 1 and arg.startswith("-"):
# Indent after the next argument
formatted_command.append(" ")
i += 1
formatted_command.append(shlex.quote(command_list[i]))
if i < len(command_list) - 1:
# Add line continuation only if it's not the last argument

14
pkgs/clan-cli/clan_lib/flake/flake.py
View File

@@ -677,14 +677,12 @@ class FlakeCacheEntry:
result_dict: dict[str, Any] = {}
for key in keys_to_select:
value = self.value[key].select(selectors[1:])
if self.value[key].exists:
# Skip empty dicts when the original value is None
if not (
isinstance(value, dict)
and len(value) == 0
and self.value[key].value is None
):
result_dict[key] = value
if self.value[key].exists and not (
isinstance(value, dict)
and len(value) == 0
and self.value[key].value is None
):
result_dict[key] = value
return result_dict
# return a KeyError if we cannot fetch the key