From cc8a3792a88a0579f8621a87f643d6016c131874 Mon Sep 17 00:00:00 2001 From: John Davidge Date: Mon, 27 Jul 2015 11:39:59 +0100 Subject: [PATCH] Fix inconsistency of if/return logic in attributes.py In neutron/api/v2/attributes.py some methods use: if data is None: return return something Others use: if data is not None: return something Both have the same effect, but are inconsistent. This patch standardises the usage around the shorter version. Change-Id: Idc9e6eb1852d2565906fc2c8e8a7c0a63bc1a0dd Closes-Bug: 1478512 --- neutron/api/v2/attributes.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py index 64a45e891..67534c8f2 100644 --- a/neutron/api/v2/attributes.py +++ b/neutron/api/v2/attributes.py @@ -180,9 +180,8 @@ def _validate_mac_address(data, valid_values=None): def _validate_mac_address_or_none(data, valid_values=None): - if data is None: - return - return _validate_mac_address(data, valid_values) + if data is not None: + return _validate_mac_address(data, valid_values) def _validate_ip_address(data, valid_values=None): @@ -308,9 +307,8 @@ def _validate_hostroutes(data, valid_values=None): def _validate_ip_address_or_none(data, valid_values=None): - if data is None: - return None - return _validate_ip_address(data, valid_values) + if data is not None: + return _validate_ip_address(data, valid_values) def _validate_subnet(data, valid_values=None): @@ -348,9 +346,8 @@ def _validate_subnet_list(data, valid_values=None): def _validate_subnet_or_none(data, valid_values=None): - if data is None: - return - return _validate_subnet(data, valid_values) + if data is not None: + return _validate_subnet(data, valid_values) def _validate_regex(data, valid_values=None): @@ -366,9 +363,8 @@ def _validate_regex(data, valid_values=None): def _validate_regex_or_none(data, valid_values=None): - if data is None: - return - return _validate_regex(data, valid_values) + if data is not None: + return _validate_regex(data, valid_values) def _validate_uuid(data, valid_values=None): -- 2.45.2