openstack/neutron
Code Issues Proposed changes

Merge "Python 3: do not compare int and NoneType"

Browse Source
This commit is contained in:
Jenkins 2015-08-13 01:57:55 +00:00 committed by Gerrit Code Review
commit 6834718356
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/api/api_common.py
View File

@ -273,7 +273,17 @@ class SortingEmulatedHelper(SortingHelper):
def sort(self, items): def sort(self, items):
def cmp_func(obj1, obj2): def cmp_func(obj1, obj2):
for key, direction in self.sort_dict: for key, direction in self.sort_dict:
ret = (obj1[key] > obj2[key]) - (obj1[key] < obj2[key]) o1 = obj1[key]
o2 = obj2[key]
if o1 is None and o2 is None:
ret = 0
elif o1 is None and o2 is not None:
ret = -1
elif o1 is not None and o2 is None:
ret = 1
else:
ret = (o1 > o2) - (o1 < o2)
if ret: if ret:
return ret * (1 if direction else -1) return ret * (1 if direction else -1)
return 0 return 0

3
neutron/db/securitygroups_db.py
View File

@ -430,6 +430,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
ip_proto = self._get_ip_proto_number(rule['protocol']) ip_proto = self._get_ip_proto_number(rule['protocol'])
if ip_proto in [constants.PROTO_NUM_TCP, constants.PROTO_NUM_UDP]: if ip_proto in [constants.PROTO_NUM_TCP, constants.PROTO_NUM_UDP]:
if (rule['port_range_min'] is not None and if (rule['port_range_min'] is not None and
rule['port_range_max'] is not None and
rule['port_range_min'] <= rule['port_range_max']): rule['port_range_min'] <= rule['port_range_max']):
pass pass
else: else:
@ -437,7 +438,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
elif ip_proto == constants.PROTO_NUM_ICMP: elif ip_proto == constants.PROTO_NUM_ICMP:
for attr, field in [('port_range_min', 'type'), for attr, field in [('port_range_min', 'type'),
('port_range_max', 'code')]: ('port_range_max', 'code')]:
if rule[attr] > 255: if rule[attr] is not None and rule[attr] > 255:
raise ext_sg.SecurityGroupInvalidIcmpValue( raise ext_sg.SecurityGroupInvalidIcmpValue(
field=field, attr=attr, value=rule[attr]) field=field, attr=attr, value=rule[attr])
if (rule['port_range_min'] is None and if (rule['port_range_min'] is None and