git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Global replace of Nicira Networks.
[sliver-openvswitch.git]
/
python
/
ovs
/
db
/
types.py
diff --git
a/python/ovs/db/types.py
b/python/ovs/db/types.py
index
18b7081
..
96cdae8
100644
(file)
--- a/
python/ovs/db/types.py
+++ b/
python/ovs/db/types.py
@@
-1,4
+1,4
@@
-# Copyright (c) 2009, 2010, 2011
Nicira Networks
+# Copyright (c) 2009, 2010, 2011
, 2012 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-282,7
+282,8
@@
class BaseType(object):
else:
return self.type.to_string()
else:
return self.type.to_string()
- def constraintsToEnglish(self, escapeLiteral=returnUnchanged):
+ def constraintsToEnglish(self, escapeLiteral=returnUnchanged,
+ escapeNumber=returnUnchanged):
if self.enum:
literals = [value.toEnglish(escapeLiteral)
for value in self.enum.values]
if self.enum:
literals = [value.toEnglish(escapeLiteral)
for value in self.enum.values]
@@
-294,30
+295,35
@@
class BaseType(object):
literals[-1])
elif self.min is not None and self.max is not None:
if self.type == IntegerType:
literals[-1])
elif self.min is not None and self.max is not None:
if self.type == IntegerType:
- english = 'in range %s to %s' % (commafy(self.min),
- commafy(self.max))
+ english = 'in range %s to %s' % (
+ escapeNumber(commafy(self.min)),
+ escapeNumber(commafy(self.max)))
else:
else:
- english = 'in range %g to %g' % (self.min, self.max)
+ english = 'in range %s to %s' % (
+ escapeNumber("%g" % self.min),
+ escapeNumber("%g" % self.max))
elif self.min is not None:
if self.type == IntegerType:
elif self.min is not None:
if self.type == IntegerType:
- english = 'at least %s' %
commafy(self.min
)
+ english = 'at least %s' %
escapeNumber(commafy(self.min)
)
else:
else:
- english = 'at least %
g' % self.min
+ english = 'at least %
s' % escapeNumber("%g" % self.min)
elif self.max is not None:
if self.type == IntegerType:
elif self.max is not None:
if self.type == IntegerType:
- english = 'at most %s' %
commafy(self.max
)
+ english = 'at most %s' %
escapeNumber(commafy(self.max)
)
else:
else:
- english = 'at most %
g' % self.max
+ english = 'at most %
s' % escapeNumber("%g" % self.max)
elif self.min_length != 0 and self.max_length != sys.maxint:
if self.min_length == self.max_length:
elif self.min_length != 0 and self.max_length != sys.maxint:
if self.min_length == self.max_length:
- english = 'exactly %d characters long' % (self.min_length)
+ english = ('exactly %s characters long'
+ % commafy(self.min_length))
else:
else:
- english = ('between %d and %d characters long'
- % (self.min_length, self.max_length))
+ english = ('between %s and %s characters long'
+ % (commafy(self.min_length),
+ commafy(self.max_length)))
elif self.min_length != 0:
elif self.min_length != 0:
- return 'at least %
d characters long' % self.min_length
+ return 'at least %
s characters long' % commafy(self.min_length)
elif self.max_length != sys.maxint:
elif self.max_length != sys.maxint:
- english = 'at most %
d characters long' % self.max_length
+ english = 'at most %
s characters long' % commafy(self.max_length)
else:
english = ''
else:
english = ''
@@
-517,13
+523,14
@@
class Type(object):
else:
if self.n_max == sys.maxint:
if self.n_min:
else:
if self.n_max == sys.maxint:
if self.n_min:
- quantity = "%
d or more " % self.n_min
+ quantity = "%
s or more " % commafy(self.n_min)
else:
quantity = ""
elif self.n_min:
else:
quantity = ""
elif self.n_min:
- quantity = "%d to %d " % (self.n_min, self.n_max)
+ quantity = "%s to %s " % (commafy(self.n_min),
+ commafy(self.n_max))
else:
else:
- quantity = "up to %
d " % self.n_max
+ quantity = "up to %
s " % commafy(self.n_max)
if self.value:
return "map of %s%s-%s pairs" % (quantity, keyName, valueName)
if self.value:
return "map of %s%s-%s pairs" % (quantity, keyName, valueName)
@@
-534,9
+541,11
@@
class Type(object):
plural = keyName + "s"
return "set of %s%s" % (quantity, plural)
plural = keyName + "s"
return "set of %s%s" % (quantity, plural)
- def constraintsToEnglish(self, escapeLiteral=returnUnchanged):
+ def constraintsToEnglish(self, escapeLiteral=returnUnchanged,
+ escapeNumber=returnUnchanged):
constraints = []
constraints = []
- keyConstraints = self.key.constraintsToEnglish(escapeLiteral)
+ keyConstraints = self.key.constraintsToEnglish(escapeLiteral,
+ escapeNumber)
if keyConstraints:
if self.value:
constraints.append('key %s' % keyConstraints)
if keyConstraints:
if self.value:
constraints.append('key %s' % keyConstraints)
@@
-544,7
+553,8
@@
class Type(object):
constraints.append(keyConstraints)
if self.value:
constraints.append(keyConstraints)
if self.value:
- valueConstraints = self.value.constraintsToEnglish(escapeLiteral)
+ valueConstraints = self.value.constraintsToEnglish(escapeLiteral,
+ escapeNumber)
if valueConstraints:
constraints.append('value %s' % valueConstraints)
if valueConstraints:
constraints.append('value %s' % valueConstraints)