@@ -29,11 +29,11 @@ class FieldType(object):
2929 multi = False
3030
3131 def __init__ (self , ** kwargs ):
32- self .required = kwargs ['required' ] if kwargs . has_key ( 'required' ) else False
33- self .depend = kwargs ['depend' ] if kwargs . has_key ( 'depend' ) else None
34- self .conflict = kwargs ['conflict' ] if kwargs . has_key ( 'conflict' ) else None
35- self .code = kwargs ['code' ] if kwargs . has_key ( 'code' ) else None
36- self .multi = kwargs ['multi' ] if kwargs . has_key ( 'multi' ) else False
32+ self .required = kwargs ['required' ] if 'required' in kwargs else False
33+ self .depend = kwargs ['depend' ] if 'depend' in kwargs else None
34+ self .conflict = kwargs ['conflict' ] if 'conflict' in kwargs else None
35+ self .code = kwargs ['code' ] if 'code' in kwargs else None
36+ self .multi = kwargs ['multi' ] if 'multi' in kwargs else False
3737
3838 def validate (self , value ):
3939 retval = False
@@ -56,27 +56,27 @@ def validate(self, value):
5656 elif not (self .minlen and self .maxlen ):
5757 valid = True
5858 elif self .minlen and not self .maxlen :
59- valid = self .minlen <= len (unicode (value ))
59+ valid = self .minlen <= len (str (value ))
6060 elif self .maxlen and not self .minlen :
61- valid = len (unicode (value )) <= self .maxlen
61+ valid = len (str (value )) <= self .maxlen
6262 else :
63- valid = self .minlen <= len (unicode (value )) <= self .maxlen
63+ valid = self .minlen <= len (str (value )) <= self .maxlen
6464
6565 if valid :
66- return value if isinstance (value ,( str , unicode )) else unicode (value )
66+ return value if isinstance (value ,str ) else str (value )
6767 else :
6868 return valid
6969
7070 def __init__ (self , ** kwargs ):
7171
72- self .minlen = kwargs ['minlen' ] if kwargs . has_key ( 'minlen' ) else False
73- self .maxlen = kwargs ['maxlen' ] if kwargs . has_key ( 'maxlen' ) else False
72+ self .minlen = kwargs ['minlen' ] if 'minlen' in kwargs else False
73+ self .maxlen = kwargs ['maxlen' ] if 'maxlen' in kwargs else False
7474
7575 super (FieldString ,self ).__init__ (** kwargs )
7676
7777 @classmethod
7878 def tostring (cls ,value ):
79- return unicode (value )
79+ return str (value )
8080
8181
8282class FieldCostant (FieldType ):
@@ -87,20 +87,20 @@ class FieldCostant(FieldType):
8787 def validate (self , value ):
8888 if super (FieldCostant ,self ).validate (value ):
8989 return value
90- elif unicode (value ) in self .cvalue :
90+ elif str (value ) in self .cvalue :
9191 return value
9292 else :
9393 return False
9494
9595 def __init__ (self , ** kwargs ):
9696
97- self .cvalue = kwargs ['cvalue' ] if kwargs . has_key ( 'cvalue' ) else None
97+ self .cvalue = kwargs ['cvalue' ] if 'cvalue' in kwargs else None
9898
9999 super (FieldCostant ,self ).__init__ (** kwargs )
100100
101101 @classmethod
102102 def tostring (cls ,value ):
103- return unicode (value )
103+ return str (value )
104104
105105
106106class FieldInteger (FieldType ):
@@ -120,8 +120,8 @@ def validate(self, value):
120120
121121 def __init__ (self , ** kwargs ):
122122
123- self .minlen = kwargs ['minlen' ] if kwargs . has_key ( 'minlen' ) else None
124- self .maxlen = kwargs ['maxlen' ] if kwargs . has_key ( 'maxlen' ) else None
123+ self .minlen = kwargs ['minlen' ] if 'minlen' in kwargs else None
124+ self .maxlen = kwargs ['maxlen' ] if 'maxlen' in kwargs else None
125125
126126 super (FieldInteger ,self ).__init__ (** kwargs )
127127
@@ -143,13 +143,13 @@ def validate(self, value):
143143 elif self .minlen <= len ('{:.2f}' .format (float (value ))) <= self .maxlen :
144144 return float (value )
145145 except (ValueError , TypeError ):
146- print 'DEBUG- ' , value
146+ print ( 'DEBUG- ' , value )
147147 return False
148148
149149 def __init__ (self , ** kwargs ):
150150
151- self .minlen = kwargs ['minlen' ] if kwargs . has_key ( 'minlen' ) else None
152- self .maxlen = kwargs ['maxlen' ] if kwargs . has_key ( 'maxlen' ) else None
151+ self .minlen = kwargs ['minlen' ] if 'minlen' in kwargs else None
152+ self .maxlen = kwargs ['maxlen' ] if 'maxlen' in kwargs else None
153153
154154 super (FieldDecimal ,self ).__init__ (** kwargs )
155155
@@ -209,7 +209,7 @@ def validate(self, value):
209209
210210 def __init__ (self , ** kwargs ):
211211
212- self .object_class = kwargs ['object_class' ] if kwargs . has_key ( 'object_class' ) else False
212+ self .object_class = kwargs ['object_class' ] if 'object_class' in kwargs else False
213213 super (FieldObject ,self ).__init__ (** kwargs )
214214
215215 @classmethod
0 commit comments