git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f raise
[sfa.git]
/
sfa
/
util
/
method.py
diff --git
a/sfa/util/method.py
b/sfa/util/method.py
index
e7bdee7
..
4e21170
100644
(file)
--- a/
sfa/util/method.py
+++ b/
sfa/util/method.py
@@
-250,20
+250,20
@@
class Method:
if expected_type in StringTypes:
if min is not None and \
len(value.encode(self.api.encoding)) < min:
if expected_type in StringTypes:
if min is not None and \
len(value.encode(self.api.encoding)) < min:
- raise SfaInvalidArgument
, "%s must be at least %d bytes long" % (name, min
)
+ raise SfaInvalidArgument
("%s must be at least %d bytes long" % (name, min)
)
if max is not None and \
len(value.encode(self.api.encoding)) > max:
if max is not None and \
len(value.encode(self.api.encoding)) > max:
- raise SfaInvalidArgument
, "%s must be at most %d bytes long" % (name, max
)
+ raise SfaInvalidArgument
("%s must be at most %d bytes long" % (name, max)
)
elif expected_type in (list, tuple, set):
if min is not None and len(value) < min:
elif expected_type in (list, tuple, set):
if min is not None and len(value) < min:
- raise SfaInvalidArgument
, "%s must contain at least %d items" % (name, min
)
+ raise SfaInvalidArgument
("%s must contain at least %d items" % (name, min)
)
if max is not None and len(value) > max:
if max is not None and len(value) > max:
- raise SfaInvalidArgument
, "%s must contain at most %d items" % (name, max
)
+ raise SfaInvalidArgument
("%s must contain at most %d items" % (name, max)
)
else:
if min is not None and value < min:
else:
if min is not None and value < min:
- raise SfaInvalidArgument
, "%s must be > %s" % (name, str(min
))
+ raise SfaInvalidArgument
("%s must be > %s" % (name, str(min)
))
if max is not None and value > max:
if max is not None and value > max:
- raise SfaInvalidArgument
, "%s must be < %s" % (name, str(max
))
+ raise SfaInvalidArgument
("%s must be < %s" % (name, str(max)
))
# If a list with particular types of items is expected
if isinstance(expected, (list, tuple, set)):
# If a list with particular types of items is expected
if isinstance(expected, (list, tuple, set)):