From e6129a76e7093b8f9f7717e5f63ed06f9e9ef30a Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 10 Feb 2017 14:31:10 +0100 Subject: [PATCH] Stable _is_null check Avoid comparison of bytes with int in _is_null() check. b'' == 0 triggers a BytesWarning. Signed-off-by: Christian Heimes Reviewed-By: Martin Basti Reviewed-By: Alexander Bokovoy --- ipalib/parameters.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 073e1383e..7fbe63e69 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -123,7 +123,13 @@ from ipapython.dnsutil import DNSName def _is_null(value): - return not value and value != 0 # NOTE: False == 0 + if value: + return False + elif isinstance(value, six.integer_types + (float, decimal.Decimal)): + # 0 is not NULL + return False + else: + return True if six.PY3: unicode = str