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

Revert "wrap try/except around getattr to prevent errors on some descriptors" 

This reverts commit 330f15b8cb.
This commit is contained in:
Ryan Pessa 2012-12-13 17:07:58 -06:00
parent ff9bb377e0
commit 9f1c93a421
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kivy/_event.pyx
View File

@ -52,16 +52,12 @@ cdef class EventDispatcher(object):
attrs_found = cp[__cls__] = {}
attrs = dir(__cls__)
for k in attrs:
try:
uattr = getattr(__cls__, k)
except AttributeError:
pass
else:
if not isinstance(uattr, Property):
continue
if k == 'touch_down' or k == 'touch_move' or k == 'touch_up':
raise Exception('The property <%s> have a forbidden name' % k)
attrs_found[k] = uattr
uattr = getattr(__cls__, k)
if not isinstance(uattr, Property):
continue
if k == 'touch_down' or k == 'touch_move' or k == 'touch_up':
raise Exception('The property <%s> have a forbidden name' % k)
attrs_found[k] = uattr
else:
attrs_found = cp[__cls__]