From 565e798ef9622486e9a11382085caf1e9c465241 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Thu, 18 Mar 2021 14:19:51 +0100 Subject: Print json instead of python dict in responses r.json() decodes the responses json and passes it to json.loads() which will convert the content into a python dictionary. Print the literal JSON text so that output can be further manipulated by other tools like jq. --- cli/objects/client.py | 6 +++--- cli/objects/modes.py | 2 +- cli/objects/scopes.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/objects/client.py b/cli/objects/client.py index d060af1..bee1ba4 100644 --- a/cli/objects/client.py +++ b/cli/objects/client.py @@ -13,7 +13,7 @@ class OgClient(): @staticmethod def list_clients(rest): r = rest.get('/clients') - print(r.json()) + print(r.text) @staticmethod def list_client_hardware(rest, args): @@ -27,7 +27,7 @@ class OgClient(): payload = {'client': parsed_args.client_ip} r = rest.get('/hardware', payload=payload) - print(r.json()) + print(r.text) @staticmethod def get_client_properties(rest, args): @@ -40,4 +40,4 @@ class OgClient(): payload = {'client': parsed_args.client_ip} r = rest.get('/client/info', payload=payload) - print(r.json()) + print(r.text) diff --git a/cli/objects/modes.py b/cli/objects/modes.py index c228eb0..e172570 100644 --- a/cli/objects/modes.py +++ b/cli/objects/modes.py @@ -13,7 +13,7 @@ class OgModes(): @staticmethod def list_available_modes(rest): r = rest.get('/mode') - print(r.json()) + print(r.text) @staticmethod def set_modes(rest, args): diff --git a/cli/objects/scopes.py b/cli/objects/scopes.py index 7f4cd7d..975b82f 100644 --- a/cli/objects/scopes.py +++ b/cli/objects/scopes.py @@ -11,4 +11,4 @@ class OgScope(): @staticmethod def list_scopes(rest): r = rest.get('/scopes') - print(r.json()) + print(r.text) -- cgit v1.2.3-18-g5258