From b7e3210631d3cb8f687a40947e41036d6939a71c Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 22 Apr 2024 16:20:30 +0800 Subject: [PATCH] Handle non-JSON return values --- collection/plugins/modules/device.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collection/plugins/modules/device.py b/collection/plugins/modules/device.py index 61c1f24..b92170e 100644 --- a/collection/plugins/modules/device.py +++ b/collection/plugins/modules/device.py @@ -157,12 +157,14 @@ def remote_config(module, method='GET', config=None, result=None, device=None, try: content = resp.read() - return json.loads(content) - except (AttributeError, json.decoder.JSONDecodeError): + except AttributeError: result['content'] = info.pop('body', '') module.fail_json(msg='Error occured while reading response', **result) - return {} # not reachable but prevents linter complaints + try: + return json.loads(content) + except json.decoder.JSONDecodeError: + return {'content': content} def get_device(module, device=None):