From f3aca42e693f8620f995e07879596cda37d968fd Mon Sep 17 00:00:00 2001 From: Eldinnie Date: Fri, 12 May 2017 17:38:36 +0200 Subject: [PATCH] pass errormessage to Unauthorized (#597) --- telegram/error.py | 4 +--- telegram/utils/request.py | 2 +- tests/test_updater.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/telegram/error.py b/telegram/error.py index b61559656..9f0f77a40 100644 --- a/telegram/error.py +++ b/telegram/error.py @@ -62,9 +62,7 @@ class TelegramError(Exception): class Unauthorized(TelegramError): - - def __init__(self): - super(Unauthorized, self).__init__('Unauthorized') + pass class InvalidToken(TelegramError): diff --git a/telegram/utils/request.py b/telegram/utils/request.py index 540e9c467..f08ffc370 100644 --- a/telegram/utils/request.py +++ b/telegram/utils/request.py @@ -183,7 +183,7 @@ class Request(object): raise NetworkError('Unknown HTTPError {0}'.format(resp.status)) if resp.status in (401, 403): - raise Unauthorized() + raise Unauthorized(message) elif resp.status == 400: raise BadRequest(message) elif resp.status == 404: diff --git a/tests/test_updater.py b/tests/test_updater.py index 676ccd18d..ef8c4e146 100644 --- a/tests/test_updater.py +++ b/tests/test_updater.py @@ -693,7 +693,7 @@ class UpdaterTest(BaseTest, unittest.TestCase): def test_bootstrap_retries_unauth(self): retries = 3 self._setup_updater( - '', messages=0, bootstrap_retries=retries, bootstrap_err=Unauthorized()) + '', messages=0, bootstrap_retries=retries, bootstrap_err=Unauthorized("Unauthorized")) self.assertRaises(Unauthorized, self.updater._bootstrap, retries, False, 'path', None) self.assertEqual(self.updater.bot.bootstrap_attempts, 1)