summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/objects/modes.py2
-rw-r--r--cli/utils.py8
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 = []