From 40bd1463770929788f64ba32b892b6af3009f929 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Tue, 30 Mar 2021 12:23:52 +0200 Subject: Fix utils.py When utils.py was created, moved functions declaration was not kept for scope_lookup by mistake, in previous commit it was named 'scope_lookup_id'. ips_in_scope is a function that maps a list of scopes to the list of ips contained in it, recursively. (if the scope is a room it will gather all computers ips in that room). Add 'None' check for its scope param, avoiding duplication of this check in several other objects using this function. Also import utils in 'modes' object, which was not added previously. Fixes: be84b0a ("Add utils.py") --- cli/objects/modes.py | 2 ++ cli/utils.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cli/objects/modes.py b/cli/objects/modes.py index 8ede3c8..84d6f45 100644 --- a/cli/objects/modes.py +++ b/cli/objects/modes.py @@ -6,6 +6,8 @@ # Free Software Foundation, version 3. # +from cli.utils import * + import argparse class OgModes(): diff --git a/cli/utils.py b/cli/utils.py index f72693c..a69c0cd 100644 --- a/cli/utils.py +++ b/cli/utils.py @@ -6,16 +6,18 @@ # Free Software Foundation, version 3. # -def scope_lookup_id(scope_id, scope_type, d): +def scope_lookup(scope_id, scope_type, d): if scope_id == d.get('id') and scope_type == d.get('type'): return d for scope in d['scope']: lookup = scope_lookup(scope_id, scope_type, scope) - if lookup is not None: - return lookup + if lookup is not None: + return lookup return None def ips_in_scope(scope): + if scope is None: + return [] if 'ip' in scope: return [scope['ip']] ips = [] -- cgit v1.2.3-18-g5258