dispatcher: also break on errors in checkHandler

jh0ker · jh0ker · commit 687a3b0ba10d · 2016-04-18T17:15:41.000+02:00
diff --git a/telegram/ext/dispatcher.py b/telegram/ext/dispatcher.py
@@ -172,34 +172,32 @@ def processUpdate(self, update):
 
         else:
             for group in self.handlers.values():
-                handler_triggered = False
-
                 for handler in group:
                     try:
                         if handler.checkUpdate(update):
-                            handler_triggered = True
                             handler.handleUpdate(update, self)
+                            break
                     # Dispatch any errors
                     except TelegramError as te:
                         self.logger.warn(
-                            'Error was raised while processing Update.')
+                            'A TelegramError was raised while processing the '
+                            'Update.')
 
                         try:
                             self.dispatchError(update, te)
                         except:
                             self.logger.exception(
                                 'An uncaught error was raised while '
                                 'handling the error')
+                        finally:
+                            break
 
                     # Errors should not stop the thread
                     except:
                         self.logger.exception(
                             'An uncaught error was raised while '
                             'processing the update')
-
-                    finally:
-                        if handler_triggered:
-                            break
+                        break
 
     def addHandler(self, handler, group=DEFAULT_GROUP):
         """
