Update formatting for Black 24.4.0

This commit is contained in:
Joshua Boniface 2024-04-19 10:26:06 -04:00
parent 79ad09ae59
commit 9714ac20b2
6 changed files with 20 additions and 14 deletions

View File

@ -671,9 +671,9 @@ def cli_cluster_maintenance_off():
@format_opt( @format_opt(
{ {
"pretty": cli_cluster_task_format_pretty, "pretty": cli_cluster_task_format_pretty,
"raw": lambda d: "\n".join([t["id"] for t in d]) "raw": lambda d: (
if isinstance(d, list) "\n".join([t["id"] for t in d]) if isinstance(d, list) else d["state"]
else d["state"], ),
"json": lambda d: jdumps(d), "json": lambda d: jdumps(d),
"json-pretty": lambda d: jdumps(d, indent=2), "json-pretty": lambda d: jdumps(d, indent=2),
} }

View File

@ -580,9 +580,11 @@ def cli_cluster_fault_list_format_long(CLI_CONFIG, fault_data):
fault_id=fault["id"], fault_id=fault["id"],
fault_status=fault["status"].title(), fault_status=fault["status"].title(),
fault_health_delta=f"-{fault['health_delta']}%", fault_health_delta=f"-{fault['health_delta']}%",
fault_acknowledged_at=fault["acknowledged_at"] fault_acknowledged_at=(
if fault["acknowledged_at"] != "" fault["acknowledged_at"]
else "N/A", if fault["acknowledged_at"] != ""
else "N/A"
),
fault_last_reported=fault["last_reported"], fault_last_reported=fault["last_reported"],
fault_first_reported=fault["first_reported"], fault_first_reported=fault["first_reported"],
) )

View File

@ -1765,9 +1765,9 @@ def format_info(config, domain_information, long_output):
tags_name=tag["name"], tags_name=tag["name"],
tags_type=tag["type"], tags_type=tag["type"],
tags_protected=str(tag["protected"]), tags_protected=str(tag["protected"]),
tags_protected_colour=ansiprint.green() tags_protected_colour=(
if tag["protected"] ansiprint.green() if tag["protected"] else ansiprint.blue()
else ansiprint.blue(), ),
end=ansiprint.end(), end=ansiprint.end(),
) )
) )

View File

@ -320,7 +320,11 @@ def get_list_osd(zkhandler, limit=None, is_fuzzy=True):
# #
def getPoolInformation(zkhandler, pool): def getPoolInformation(zkhandler, pool):
# Parse the stats data # Parse the stats data
(pool_stats_raw, tier, pgs,) = zkhandler.read_many( (
pool_stats_raw,
tier,
pgs,
) = zkhandler.read_many(
[ [
("pool.stats", pool), ("pool.stats", pool),
("pool.tier", pool), ("pool.tier", pool),

View File

@ -244,9 +244,9 @@ def get_parsed_configuration(config_file):
] ]
][0] ][0]
config_cluster_networks_specific[ config_cluster_networks_specific[f"{network_type}_dev_ip"] = (
f"{network_type}_dev_ip" f"{list(network.hosts())[address_id]}/{network.prefixlen}"
] = f"{list(network.hosts())[address_id]}/{network.prefixlen}" )
config = {**config, **config_cluster_networks_specific} config = {**config, **config_cluster_networks_specific}

View File

@ -231,7 +231,7 @@ class NetstatsInstance(object):
# Get a list of all active interfaces # Get a list of all active interfaces
net_root_path = "/sys/class/net" net_root_path = "/sys/class/net"
all_ifaces = list() all_ifaces = list()
for (_, dirnames, _) in walk(net_root_path): for _, dirnames, _ in walk(net_root_path):
all_ifaces.extend(dirnames) all_ifaces.extend(dirnames)
all_ifaces.sort() all_ifaces.sort()