Add specific exceptions types for important errors

tsnoam · tsnoam · commit d4beb940597b · 2016-02-06T18:48:55.000+02:00
maintain backward compatibility with the 'old' exception by inherting
from TelegramError and using the same message
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -25,6 +25,7 @@
 
 from telegram import (User, Message, Update, UserProfilePhotos, File,
                       TelegramError, ReplyMarkup, TelegramObject, NullHandler)
+from telegram.error import InvalidToken
 from telegram.utils import request
 
 H = NullHandler()
@@ -751,5 +752,5 @@ def _valid_token(token):
         """a very basic validation on token"""
         left, sep, _right = token.partition(':')
         if (not sep) or (not left.isdigit()) or (len(left) < 3):
-            raise TelegramError('Invalid token')
+            raise InvalidToken()
         return token
diff --git a/telegram/error.py b/telegram/error.py
@@ -59,3 +59,25 @@ def __init__(self, message):
 
     def __str__(self):
         return '%s' % (self.message)
+
+
+class Unauthorized(TelegramError):
+
+    def __init__(self):
+        super(Unauthorized, self).__init__('Unauthorized')
+
+
+class InvalidToken(TelegramError):
+
+    def __init__(self):
+        super(InvalidToken, self).__init__('Invalid token')
+
+
+class NetworkError(TelegramError):
+    pass
+
+
+class TimedOut(NetworkError):
+
+    def __init__(self):
+        super(TimedOut, self).__init__('Timed out')
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -43,6 +43,7 @@
     from urllib2 import HTTPError
 
 from telegram import (InputFile, TelegramError)
+from telegram.error import Unauthorized, NetworkError, TimedOut
 
 
 def _parse(json_data):
@@ -79,7 +80,7 @@ def decorator(*args, **kwargs):
             # `HTTPError` inherits from `URLError` so `HTTPError` handling must
             # come first.
             if error.getcode() == 403:
-                raise TelegramError('Unauthorized')
+                raise Unauthorized()
             if error.getcode() == 502:
                 raise TelegramError('Bad Gateway')
 
@@ -88,19 +89,20 @@ def decorator(*args, **kwargs):
             except ValueError:
                 message = 'Unknown HTTPError {0}'.format(error.getcode())
 
-            raise TelegramError(message)
+            raise NetworkError(message)
 
         except URLError as error:
-            raise TelegramError('URLError: {0!r}'.format(error))
+            raise NetworkError('URLError: {0!r}'.format(error))
 
         except (SSLError, socket.timeout) as error:
-            if "operation timed out" in str(error):
-                raise TelegramError("Timed out")
+            err_s = str(error)
+            if "operation timed out" in err_s:
+                raise TimedOut()
 
-            raise TelegramError(str(error))
+            raise NetworkError(err_s)
 
         except HTTPException as error:
-            raise TelegramError('HTTPException: {0!r}'.format(error))
+            raise NetworkError('HTTPException: {0!r}'.format(error))
 
     return decorator
 
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -145,7 +145,7 @@ def testGetUserProfilePhotos(self):
 
     def _test_invalid_token(self, token):
         print('Testing invalid token: {0}'.format(token))
-        self.assertRaisesRegexp(telegram.TelegramError, 'Invalid token', telegram.Bot, token)
+        self.assertRaisesRegexp(telegram.error.InvalidToken, 'Invalid token', telegram.Bot, token)
 
     def testInvalidToken1(self):
         self._test_invalid_token('123')
@@ -158,7 +158,7 @@ def testInvalidToken3(self):
 
     def testUnauthToken(self):
         print('Testing unauthorized token')
-        with self.assertRaisesRegexp(telegram.TelegramError, 'Unauthorized'):
+        with self.assertRaisesRegexp(telegram.error.Unauthorized, 'Unauthorized'):
             bot = telegram.Bot('1234:abcd1234')
             bot.getMe()
 
