echobot: simplify exception handling

rahiel · rahiel · commit 3e978277b38a · 2016-02-09T15:28:54.000+01:00
diff --git a/examples/legacy/echobot.py b/examples/legacy/echobot.py
@@ -6,13 +6,9 @@
 
 import logging
 import telegram
+from telegram.error import NetworkError, Unauthorized
 from time import sleep
 
-try:
-    from urllib.error import URLError
-except ImportError:
-    from urllib2 import URLError  # python 2
-
 
 def main():
     # Telegram Bot Authorization Token
@@ -31,18 +27,11 @@ def main():
     while True:
         try:
             update_id = echo(bot, update_id)
-        except telegram.TelegramError as e:
-            # These are network problems with Telegram.
-            if e.message in ("Bad Gateway", "Timed out"):
-                sleep(1)
-            elif e.message == "Unauthorized":
-                # The user has removed or blocked the bot.
-                update_id += 1
-            else:
-                raise e
-        except URLError as e:
-            # These are network problems on our end.
+        except NetworkError:
             sleep(1)
+        except Unauthorized:
+            # The user has removed or blocked the bot.
+            update_id += 1
 
 
 def echo(bot, update_id):
