OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-11-22 07:06:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve error handling on timeouts

Browse source
This commit is contained in:
Jannes Höke 2015-11-11 14:05:57 +01:00
parent 206802cf4d
commit 0b4c23f50e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
telegram/utils/request.py
View file

@ -20,6 +20,7 @@
"""This module contains methods to make POST and GET requests"""
import json
import socket
from ssl import SSLError
try:
@ -111,11 +112,11 @@ def post(url,
message = _parse(error.read())
raise TelegramError(message)
except SSLError as error:
if "operation timed out" in error.message:
except (SSLError, socket.timeout) as error:
if "operation timed out" in str(error):
raise TelegramError("Timed out")
raise TelegramError(error.message)
raise TelegramError(str(error))
return _parse(result)