mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

python: Take advantage of Python "x < y < z" syntax.

Browse Source 
Suggested-by: Reid Price <reid@nicira.com>
This commit is contained in:
Ben Pfaff
2011-08-22 16:49:53 -07:00
parent f2d8ad13e1
commit d272c10ecd
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ovsdb-types.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009, 2010 Nicira Networks /* Copyright (c) 2009, 2010, 2011 Nicira Networks
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -556,7 +556,6 @@ ovsdb_type_is_valid(const struct ovsdb_type *type)
&& ovsdb_base_type_is_valid(&type->key) && ovsdb_base_type_is_valid(&type->key)
&& ovsdb_base_type_is_valid(&type->value) && ovsdb_base_type_is_valid(&type->value)
&& type->n_min <= 1 && type->n_min <= 1
&& type->n_min <= type->n_max
&& type->n_max >= 1); && type->n_max >= 1);
} }

2
python/ovs/db/data.py
View File

@@ -402,7 +402,7 @@ class Datum(object):
def conforms_to_type(self): def conforms_to_type(self):
n = len(self.values) n = len(self.values)
return n >= self.type.n_min and n <= self.type.n_max return self.type.n_min <= n <= self.type.n_max
def cInitDatum(self, var): def cInitDatum(self, var):
if len(self.values) == 0: if len(self.values) == 0:

4
python/ovs/db/parser.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2010 Nicira Networks # Copyright (c) 2010, 2011 Nicira Networks
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ def float_to_int(x):
# XXX still needed? # XXX still needed?
if type(x) == float: if type(x) == float:
integer = int(x) integer = int(x)
if integer == x and integer >= -2**53 and integer < 2**53: if integer == x and -2**53 <= integer < 2**53:
return integer return integer
return x return x

8
python/ovs/db/types.py
View File

@@ -141,7 +141,7 @@ class BaseType(object):
value = default value = default
else: else:
max_value = 2**32 - 1 max_value = 2**32 - 1
if value < 0 or value > max_value: if not (0 <= value <= max_value):
raise error.Error("%s out of valid range 0 to %d" raise error.Error("%s out of valid range 0 to %d"
% (name, max_value), value) % (name, max_value), value)
return value return value
@@ -396,9 +396,7 @@ class Type(object):
return (self.key.type != VoidType and self.key.is_valid() and return (self.key.type != VoidType and self.key.is_valid() and
(self.value is None or (self.value is None or
(self.value.type != VoidType and self.value.is_valid())) and (self.value.type != VoidType and self.value.is_valid())) and
self.n_min <= 1 and self.n_min <= 1 <= self.n_max)
self.n_min <= self.n_max and
self.n_max >= 1)
def is_scalar(self): def is_scalar(self):
return self.n_min == 1 and self.n_max == 1 and not self.value return self.n_min == 1 and self.n_max == 1 and not self.value
@@ -423,7 +421,7 @@ class Type(object):
def __n_from_json(json, default): def __n_from_json(json, default):
if json is None: if json is None:
return default return default
elif type(json) == int and json >= 0 and json <= sys.maxint: elif type(json) == int and 0 <= json <= sys.maxint:
return json return json
else: else:
raise error.Error("bad min or max value", json) raise error.Error("bad min or max value", json)