From 4afa81cdd03e57b26c16b1d3205196037284e685 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 15 Jul 2021 12:53:35 +0200 Subject: [PATCH] arg_validator: rename ArgValidator.DEFAULT_SENTINEL to DEFAULT To be consistent with ArgValidator.MISSING, which serves a similar purpose. Also, replace the if-else python ternary, which I find hard to read. Signed-off-by: Thomas Haller --- module_utils/network_lsr/argument_validator.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/module_utils/network_lsr/argument_validator.py b/module_utils/network_lsr/argument_validator.py index 4dacc2f..ea77f9b 100644 --- a/module_utils/network_lsr/argument_validator.py +++ b/module_utils/network_lsr/argument_validator.py @@ -87,7 +87,7 @@ class ValidationError(MyError): class ArgValidator: MISSING = object() - DEFAULT_SENTINEL = object() + DEFAULT = object() def __init__(self, name=None, required=False, default_value=None): self.name = name @@ -253,17 +253,12 @@ class ArgValidatorNum(ArgValidator): required=False, val_min=None, val_max=None, - default_value=ArgValidator.DEFAULT_SENTINEL, + default_value=ArgValidator.DEFAULT, numeric_type=int, ): - ArgValidator.__init__( - self, - name, - required, - numeric_type(0) - if default_value is ArgValidator.DEFAULT_SENTINEL - else default_value, - ) + if default_value is ArgValidator.DEFAULT: + default_value = numeric_type(0) + ArgValidator.__init__(self, name, required, default_value) self.val_min = val_min self.val_max = val_max self.numeric_type = numeric_type