Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

errorvalue and errorhandler attributes for Property base class

This commit is contained in:
will 2012-08-10 11:47:36 -04:00
parent bdc4c13119
commit a8f7092886
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kivy/properties.pxd
View File

@ -2,6 +2,9 @@ cdef class Property:
cdef str _name cdef str _name
cdef int allownone cdef int allownone
cdef object defaultvalue cdef object defaultvalue
cdef object errorvalue
cdef object errorhandler
cdef int errorvalue_set
cdef init_storage(self, dict storage) cdef init_storage(self, dict storage)
cpdef link(self, object obj, str name) cpdef link(self, object obj, str name)
cpdef link_deps(self, object obj, str name) cpdef link_deps(self, object obj, str name)

27
kivy/properties.pyx
View File

@ -191,10 +191,18 @@ cdef class Property:
self._name = '' self._name = ''
self.allownone = 0 self.allownone = 0
self.defaultvalue = None self.defaultvalue = None
self.errorvalue = None
self.errorhandler = None
self.errorvalue_set = 0
def __init__(self, defaultvalue, **kw): def __init__(self, defaultvalue, **kw):
self.defaultvalue = defaultvalue self.defaultvalue = defaultvalue
self.allownone = <int>kw.get('allownone', 0) self.allownone = <int>kw.get('allownone', 0)
self.errorvalue = kw.get('errorvalue', None)
self.errorhandler = kw.get('errorhandler', None)
if 'errorvalue' in kw: self.errorvalue_set = 1
property name: property name:
def __get__(self): def __get__(self):
@ -203,8 +211,12 @@ cdef class Property:
cdef init_storage(self, dict storage): cdef init_storage(self, dict storage):
storage['value'] = self.defaultvalue storage['value'] = self.defaultvalue
storage['allownone'] = self.allownone storage['allownone'] = self.allownone
storage['errorvalue'] = self.errorvalue
storage['errorhandler'] = self.errorhandler
storage['errorvalue_set'] = self.errorvalue_set
storage['observers'] = [] storage['observers'] = []
cpdef link(self, object obj, str name): cpdef link(self, object obj, str name):
'''Link the instance with its real name. '''Link the instance with its real name.
@ -266,7 +278,22 @@ cdef class Property:
realvalue = d['value'] realvalue = d['value']
if self.compare_value(realvalue, value): if self.compare_value(realvalue, value):
return False return False
try:
self.check(obj, value) self.check(obj, value)
except ValueError as e:
errorvalue = obj.__storage[self._name]['errorvalue']
errorhandler = obj.__storage[self._name]['errorhandler']
errorvalue_set = obj.__storage[self._name]['errorvalue_set']
if errorvalue_set == 1:
value = errorvalue
self.check(obj, value)
elif errorhandler is not None:
value = errorhandler(value)
self.check(obj, value)
else:
raise e
d['value'] = value d['value'] = value
self.dispatch(obj) self.dispatch(obj)
return True return True