equal
deleted
inserted
replaced
16 elif value in f: |
16 elif value in f: |
17 return False |
17 return False |
18 else: |
18 else: |
19 raise ValidateException(field=field, msg='%s is not boolean' % field) |
19 raise ValidateException(field=field, msg='%s is not boolean' % field) |
20 |
20 |
|
21 |
|
22 def vInteger(value, field, minv=None, maxv=None, none_allowed=False): |
|
23 |
|
24 if none_allowed and value in [None,'']: |
|
25 return None |
|
26 |
|
27 try: |
|
28 ret = int(value) |
|
29 except ValueError: |
|
30 raise ValidateException(field=field) |
|
31 except TypeError: |
|
32 raise ValidateException(field=field) |
|
33 |
|
34 if minv and ret < minv: |
|
35 raise ValidateException(field=field) |
|
36 |
|
37 if maxv and ret > maxv: |
|
38 raise ValidateException(field=field) |
|
39 |
|
40 return ret |
21 |
41 |
22 def vHash(value,field,minlength=None,maxlength=None): |
42 def vHash(value,field,minlength=None,maxlength=None): |
23 '''Validator for hash values''' |
43 '''Validator for hash values''' |
24 if not re.match(r'^[a-f0-9]*$', value.lower()): |
44 if not re.match(r'^[a-f0-9]*$', value.lower()): |
25 raise ValidateException(field=field) |
45 raise ValidateException(field=field) |