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

diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index 64a45e89105dba884a658e2073488c2a4639e545..67534c8f2ed10df19de812d4f13c0d901187ed4b 100644 (file)
--- 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):