| author | Sandro Knauß <knauss@netzguerilla.net> |
| Fri, 23 Mar 2012 16:18:12 +0100 | |
| branch | devel |
| changeset 242 | 745d829d1e02 |
| parent 196 | ee2c051fbe3f |
| child 267 | ef2df3f23cb1 |
| permissions | -rw-r--r-- |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
1 |
from twisted.internet import defer |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
2 |
|
|
106
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
3 |
import re |
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
4 |
from decorator import decorator |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
5 |
from inspect import getcallargs |
|
181
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
6 |
import types |
|
118
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
7 |
|
|
129
d6704178a18f
renaming NotATelNumber -> InvalidTel
Sandro Knauß <knauss@netzguerilla.net>
parents:
126
diff
changeset
|
8 |
from .error import ValidateException, InvalidTel, InvalidMail |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
9 |
from .telnumber import Telnumber |
|
106
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
10 |
|
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
11 |
def vBool(value, field): |
|
125
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
118
diff
changeset
|
12 |
'''Validator for boolean values''' |
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
13 |
t=[True, 1, "true", "True", "TRUE"] |
|
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
14 |
f=[False, 0, "false", "False", "FALSE"] |
|
114
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
15 |
if value in t: |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
16 |
return True |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
17 |
elif value in f: |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
18 |
return False |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
19 |
else: |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
20 |
raise ValidateException(field=field, msg='%s is not boolean' % field) |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
21 |
|
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
22 |
|
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
23 |
def vInteger(value, field, minv=None, maxv=None, none_allowed=False): |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
24 |
|
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
25 |
if none_allowed and value in [None,'']: |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
26 |
return None |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
27 |
|
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
28 |
try: |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
29 |
ret = int(value) |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
30 |
except ValueError: |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
31 |
raise ValidateException(field=field) |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
32 |
except TypeError: |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
33 |
raise ValidateException(field=field) |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
34 |
|
|
178
ee4a6eb5a34b
vInterger limits handles 0 correctly
Sandro Knauß <knauss@netzguerilla.net>
parents:
167
diff
changeset
|
35 |
if minv is not None and ret < minv: |
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
36 |
raise ValidateException(field=field) |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
37 |
|
|
178
ee4a6eb5a34b
vInterger limits handles 0 correctly
Sandro Knauß <knauss@netzguerilla.net>
parents:
167
diff
changeset
|
38 |
if maxv is not None and ret > maxv: |
|
136
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
39 |
raise ValidateException(field=field) |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
40 |
|
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
41 |
return ret |
|
ca926774e16c
now using job.id - integer autoincrement
Sandro Knauß <knauss@netzguerilla.net>
parents:
130
diff
changeset
|
42 |
|
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
43 |
def vHash(value,field,minlength=None,maxlength=None): |
|
125
19b3f383c9ce
getting job status form db
Sandro Knauß <knauss@netzguerilla.net>
parents:
118
diff
changeset
|
44 |
'''Validator for hash values''' |
|
114
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
45 |
if not re.match(r'^[a-f0-9]*$', value.lower()): |
|
110
601fc908d9f1
exception handling for xmprpc
Sandro Knauß <knauss@netzguerilla.net>
parents:
109
diff
changeset
|
46 |
raise ValidateException(field=field) |
|
114
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
47 |
if minlength and len(value)<minlength: |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
48 |
raise ValidateException(field=field) |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
49 |
if maxlength and len(value)>maxlength: |
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
50 |
raise ValidateException(field=field) |
|
137
e0073c462563
testing simple validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
51 |
return value.lower() |
|
106
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
52 |
|
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
53 |
def vTel(value,field): |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
54 |
'''Validator for Telefonnumbers''' |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
55 |
ret = [] |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
56 |
for v in value: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
57 |
try: |
|
167
374f34025fa1
validator now deleting doubles
Sandro Knauß <knauss@netzguerilla.net>
parents:
137
diff
changeset
|
58 |
tel=Telnumber(v) |
|
374f34025fa1
validator now deleting doubles
Sandro Knauß <knauss@netzguerilla.net>
parents:
137
diff
changeset
|
59 |
if tel not in ret: |
|
374f34025fa1
validator now deleting doubles
Sandro Knauß <knauss@netzguerilla.net>
parents:
137
diff
changeset
|
60 |
ret.append(tel) |
|
129
d6704178a18f
renaming NotATelNumber -> InvalidTel
Sandro Knauß <knauss@netzguerilla.net>
parents:
126
diff
changeset
|
61 |
except InvalidTel, e: |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
62 |
e.field=field |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
63 |
raise e |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
64 |
return ret |
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
65 |
|
|
193
e5ec4bfa4929
adding allowString and allowList to vEmail to make sure, if a list is allowd or a string.
Sandro Knauß <knauss@netzguerilla.net>
parents:
181
diff
changeset
|
66 |
def vEmail(value, field, allowString=True, allowList=True): |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
67 |
'''validator for emailadresses (see wikipeda for strange mailadresses and RFC3696) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
68 |
valid: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
69 |
"very.(),:;<>[]\\".VERY.\\"very@\\\ \\"very\\".unusual"@strange.example.com |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
70 |
""@example.org |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
71 |
"very.unusual.@.unusual.com"@example.com' |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
72 |
|
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
73 |
not valid: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
74 |
Abc.@example.com |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
75 |
Abc..123@example.com |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
76 |
thisis."notallowed@example.com |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
77 |
this\\ still\\"not\\allowed@example.com |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
78 |
''' |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
79 |
ret = [] |
|
181
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
80 |
str_=False |
|
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
81 |
if type(value) is types.StringType: |
|
193
e5ec4bfa4929
adding allowString and allowList to vEmail to make sure, if a list is allowd or a string.
Sandro Knauß <knauss@netzguerilla.net>
parents:
181
diff
changeset
|
82 |
if not allowString: |
|
e5ec4bfa4929
adding allowString and allowList to vEmail to make sure, if a list is allowd or a string.
Sandro Knauß <knauss@netzguerilla.net>
parents:
181
diff
changeset
|
83 |
raise ValidateException('%s must be a list of email addresses.'%field) |
|
181
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
84 |
str_=True |
|
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
85 |
value=[value] |
|
193
e5ec4bfa4929
adding allowString and allowList to vEmail to make sure, if a list is allowd or a string.
Sandro Knauß <knauss@netzguerilla.net>
parents:
181
diff
changeset
|
86 |
elif not allowList: |
|
e5ec4bfa4929
adding allowString and allowList to vEmail to make sure, if a list is allowd or a string.
Sandro Knauß <knauss@netzguerilla.net>
parents:
181
diff
changeset
|
87 |
raise ValidateException('%s must be a email address - No list of email addresses.'%field) |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
88 |
for v in value: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
89 |
parts= re.match(r'^(.*)@(.+?)$',v) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
90 |
if not parts: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
91 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
92 |
local=parts.group(1) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
93 |
domain=parts.group(2) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
94 |
|
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
95 |
if not re.match(r'^(\[[0-9\.]{7,16}\]|\[[0-9a-f:]{3,}\]|([a-z0-9+\-%_]+\.)+[a-z]{2,6})$',domain.lower()): |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
96 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
97 |
|
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
98 |
if local == "": |
|
130
05e599aa83c3
email test into own file
Sandro Knauß <knauss@netzguerilla.net>
parents:
129
diff
changeset
|
99 |
ret.append(v) |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
100 |
continue |
|
137
e0073c462563
testing simple validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
136
diff
changeset
|
101 |
|
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
102 |
if local.startswith(".") or local.endswith("."): |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
103 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
104 |
unquote = True |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
105 |
parts = local.split('"') |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
106 |
c=0 |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
107 |
i=0 |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
108 |
for part in parts: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
109 |
if unquote and part != "": #unquoted is not allowd so much |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
110 |
if not re.match(r'^[^\\,\[\];\(\)@<>: ]+$',part) or ".." in part: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
111 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
112 |
if i == 0: |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
113 |
if unquote and part != "" and len(parts) > 1 and part[-1] != '.': #quoted parts must be seperated by a dot |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
114 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
115 |
unquote = not unquote |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
116 |
c+=1 |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
117 |
elif part == '' or part[-1] != "\\": |
|
130
05e599aa83c3
email test into own file
Sandro Knauß <knauss@netzguerilla.net>
parents:
129
diff
changeset
|
118 |
if unquote and part != "": #quoted parts must be seperated by a dot |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
119 |
if part[0] != ".": |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
120 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
121 |
if i < len(parts)-1 and part[-1] != '.': |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
122 |
raise InvalidMail(v,field) |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
123 |
unquote = not unquote |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
124 |
c += 1 |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
125 |
i += 1 |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
126 |
if c%2 == 0 and c > 1: #no single quote allowed |
|
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
127 |
raise InvalidMail(v,field) |
|
167
374f34025fa1
validator now deleting doubles
Sandro Knauß <knauss@netzguerilla.net>
parents:
137
diff
changeset
|
128 |
if v not in ret: |
|
374f34025fa1
validator now deleting doubles
Sandro Knauß <knauss@netzguerilla.net>
parents:
137
diff
changeset
|
129 |
ret.append(v) |
|
181
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
130 |
if str_: |
|
8a5be61f34c5
email validator can now handle strings and lists
Sandro Knauß <knauss@netzguerilla.net>
parents:
178
diff
changeset
|
131 |
ret=ret[0] |
|
126
1ac2439a68b5
adding test function for email- and telefonnumbers.
Sandro Knauß <knauss@netzguerilla.net>
parents:
125
diff
changeset
|
132 |
return ret |
|
114
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
133 |
|
|
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
134 |
def validate(kwd,func, need=True,*args,**kargs): |
|
106
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
135 |
'''validate decorator |
|
196
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
136 |
use it like this: |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
137 |
@validate(kwd=userhash, func=vuserhash) |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
138 |
f(userhash) |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
139 |
that will validate usrhash with the function vuserhash. |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
140 |
Every validate function should raise an Exception, if the the value is not valid. |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
141 |
All args and kargs are used to call the validate function. |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
142 |
if need is True, the kwd can't be None.''' |
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
143 |
@decorator |
|
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
144 |
def v(f,*a,**k): |
|
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
145 |
kp=getcallargs(f,*a,**k) |
|
118
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
146 |
def dfunc(*x,**y): |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
147 |
return None |
|
114
1ed072cc6793
reconstructing validate decorator
Sandro Knauß <knauss@netzguerilla.net>
parents:
110
diff
changeset
|
148 |
try: |
|
196
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
149 |
if kp[kwd] is not None: |
|
118
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
150 |
dfunc=func |
|
196
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
151 |
elif need: |
|
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
152 |
raise ValidateException(field=kwd,msg="%s is nessasary"%kwd) |
|
115
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
153 |
except KeyError: |
|
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
154 |
if need: |
|
323d06431100
restructering validate
Sandro Knauß <knauss@netzguerilla.net>
parents:
114
diff
changeset
|
155 |
raise ValidateException(field=kwd,msg="%s is nessasary"%kwd) |
|
196
ee2c051fbe3f
test for validate.validate added
Sandro Knauß <knauss@netzguerilla.net>
parents:
193
diff
changeset
|
156 |
kp[kwd] = None |
|
118
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
157 |
|
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
158 |
def _gotResult(value): |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
159 |
kp[kwd] = value |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
160 |
e = defer.maybeDeferred(f,**kp) |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
161 |
return e |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
162 |
d = defer.maybeDeferred(dfunc, kp[kwd],kwd,*args,**kargs) |
|
e16c0250c974
validate decorator can handle deferd validators
Sandro Knauß <knauss@netzguerilla.net>
parents:
115
diff
changeset
|
163 |
return d.addCallback(_gotResult) |
|
106
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
164 |
return v |
|
d2992f011930
controller/user moved to model
Sandro Knauß <knauss@netzguerilla.net>
parents:
diff
changeset
|
165 |