Add conflicting bot id to conflict error message.

jsmnbom · jsmnbom · commit 83c374f2b09e · 2018-07-08T19:19:31.000+02:00
diff --git a/telegram/error.py b/telegram/error.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """This module contains an object that represents Telegram errors."""
+import re
 
 
 def _lstrip_str(in_s, lstr):
@@ -57,7 +58,6 @@ class Unauthorized(TelegramError):
 
 
 class InvalidToken(TelegramError):
-
     def __init__(self):
         super(InvalidToken, self).__init__('Invalid token')
 
@@ -71,7 +71,6 @@ class BadRequest(NetworkError):
 
 
 class TimedOut(NetworkError):
-
     def __init__(self):
         super(TimedOut, self).__init__('Timed out')
 
@@ -100,3 +99,12 @@ def __init__(self, retry_after):
         super(RetryAfter,
               self).__init__('Flood control exceeded. Retry in {} seconds'.format(retry_after))
         self.retry_after = float(retry_after)
+
+
+class Conflict(TelegramError):
+    def __init__(self, msg, url):
+        match = re.search(r'bot(\d+):.*/', url)
+        if match:
+            msg += '. Conflicting bot id: {}'.format(match.group(1))
+
+        super(Conflict, self).__init__(msg)
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -42,7 +42,7 @@
 
 from telegram import (InputFile, TelegramError)
 from telegram.error import (Unauthorized, NetworkError, TimedOut, BadRequest, ChatMigrated,
-                            RetryAfter, InvalidToken)
+                            RetryAfter, InvalidToken, Conflict)
 
 logging.getLogger('urllib3').setLevel(logging.WARNING)
 
@@ -215,6 +215,8 @@ def _request_wrapper(self, *args, **kwargs):
             raise BadRequest(message)
         elif resp.status == 404:
             raise InvalidToken()
+        elif resp.status == 409:
+            raise Conflict(message, args[1])
         elif resp.status == 413:
             raise NetworkError('File too large. Check telegram api limits '
                                'https://core.telegram.org/bots/api#senddocument')
