SIM102: fix
This commit is contained in:
@@ -184,11 +184,10 @@ class ClanFlake:
|
||||
self.clan_modules: list[str] = []
|
||||
self.temporary_home = temporary_home
|
||||
self.path = temporary_home / "flake"
|
||||
if not suppress_tmp_home_warning:
|
||||
if "/tmp" not in str(os.environ.get("HOME")): # noqa: S108 - Checking if HOME is in temp directory
|
||||
log.warning(
|
||||
f"!! $HOME does not point to a temp directory!! HOME={os.environ['HOME']}",
|
||||
)
|
||||
if not suppress_tmp_home_warning and "/tmp" not in str(os.environ.get("HOME")): # noqa: S108 - Checking if HOME is in temp directory
|
||||
log.warning(
|
||||
f"!! $HOME does not point to a temp directory!! HOME={os.environ['HOME']}",
|
||||
)
|
||||
|
||||
def copy(
|
||||
self,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user