From 1fadb06b7ec311008b16e5070afd2cb7045e5b8a Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Mon, 3 Jun 2024 21:33:53 +0200 Subject: cli: objects: unbreak ogcli with python 3.8 Older versions of Python can't handle interleaved quote types. Use single quotes as external string delimiter and double quotes in every part of the strings when quotation is needed. --- cli/objects/disks.py | 2 +- cli/objects/scopes.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/objects/disks.py b/cli/objects/disks.py index b832b56..856f585 100644 --- a/cli/objects/disks.py +++ b/cli/objects/disks.py @@ -108,7 +108,7 @@ class OgDisk(): p = p[0] if len(p) != 4: - print(f'Invalid partition: requires "num,part_scheme,fs,size", "{','.join(p)}" provided') + print(f'Invalid partition: requires "num,part_scheme,fs,size", "{",".join(p)}" provided') return part_num, code, fs, size = p[0], p[1].upper(), p[2].upper(), p[3] diff --git a/cli/objects/scopes.py b/cli/objects/scopes.py index 6a9b71d..d65af0a 100644 --- a/cli/objects/scopes.py +++ b/cli/objects/scopes.py @@ -13,7 +13,7 @@ import json def _find_client_path(json_data, client_ip, res): if json_data['type'] == 'computer': if json_data['ip'] == client_ip: - res.append(f'{json_data['type']}: {client_ip}') + res.append(f'{json_data["type"]}: {client_ip}') return True return False @@ -21,7 +21,7 @@ def _find_client_path(json_data, client_ip, res): for child in children: found = _find_client_path(child, client_ip, res) if found: - res.append(f'{json_data['type']}: {json_data['name']}') + res.append(f'{json_data["type"]}: {json_data["name"]}') return True return False -- cgit v1.2.3-18-g5258