From e06f2d2366da0820196efde477a38575cf93ac6d Mon Sep 17 00:00:00 2001 From: Scott McGillivray Date: Thu, 3 Jan 2019 14:23:53 +0800 Subject: [PATCH 1/2] Update zabbix.py As seen here https://www.zabbix.com/documentation/current/manual/api/reference/configuration/import Return values (boolean) Returns *true* if importing has been successful. Updated module to avoid 'Exception: object of type 'bool' has no len()' error. --- salt/modules/zabbix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/zabbix.py b/salt/modules/zabbix.py index 7cf0a55e0398..1f20dd82e0ff 100644 --- a/salt/modules/zabbix.py +++ b/salt/modules/zabbix.py @@ -2426,7 +2426,7 @@ def run_query(method, params, **connection_args): ret = _query(method, params, conn_args['url'], conn_args['auth']) if isinstance(ret['result'], bool): return ret['result'] - return ret['result'] if len(ret['result']) > 0 else False + return ret['result'] if (ret['result'] == True or len(ret['result']) > 0) else False else: raise KeyError except KeyError: From 37385c281cc14c7433e2094f1e1ca9d9e29300f3 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 20 Dec 2019 22:56:33 +0000 Subject: [PATCH 2/2] Fix linter --- salt/modules/zabbix.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/salt/modules/zabbix.py b/salt/modules/zabbix.py index 1f20dd82e0ff..1863de1eddc9 100644 --- a/salt/modules/zabbix.py +++ b/salt/modules/zabbix.py @@ -2426,7 +2426,10 @@ def run_query(method, params, **connection_args): ret = _query(method, params, conn_args['url'], conn_args['auth']) if isinstance(ret['result'], bool): return ret['result'] - return ret['result'] if (ret['result'] == True or len(ret['result']) > 0) else False + if ret['result'] is True or len(ret['result']) > 0: + return ret['result'] + else: + return False else: raise KeyError except KeyError: