remove try/except from grab/ungrab

Author: kived

kivy/input/motionevent.py

@@ -322,23 +322,15 @@ def on_touch_up(self, touch):
             raise Exception('Grab works only for Touch MotionEvents.')
         if self.grab_exclusive_class is not None:
             raise Exception('Cannot grab the touch, touch is exclusive')
-        try:
-            class_instance = weakref.ref(class_instance)
-        except TypeError:
-            # handle weakproxy objects which cannot be weakref'd
-            class_instance = weakref.ref(class_instance.__self__)
+        class_instance = weakref.ref(class_instance.__self__)
         if exclusive:
             self.grab_exclusive_class = class_instance
         self.grab_list.append(class_instance)
 
     def ungrab(self, class_instance):
         '''Ungrab a previously grabbed touch
         '''
-        try:
-            class_instance = weakref.ref(class_instance)
-        except TypeError:
-            # handle weakproxy objects which cannot be weakref'd
-            class_instance = weakref.ref(class_instance.__self__)
+        class_instance = weakref.ref(class_instance.__self__)
         if self.grab_exclusive_class == class_instance:
             self.grab_exclusive_class = None
         if class_instance in self.grab_list: