Skip to content

_try_except_req(): catch httplib.HTTPException #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jh0ker merged 1 commit into from
Jan 22, 2016
Merged

_try_except_req(): catch httplib.HTTPException #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions telegram/utils/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
import socket
from ssl import SSLError

try:
# python2
from httplib import HTTPException
except ImportError:
# python3
from http.client import HTTPException

try:
from urllib.request import urlopen, urlretrieve, Request
from urllib.error import HTTPError
Expand Down Expand Up @@ -82,6 +89,8 @@ def decorator(*args, **kwargs):
raise TelegramError("Timed out")

raise TelegramError(str(error))
except HTTPException as error:
raise TelegramError('HTTPException: {0!r}'.format(error))

return decorator

Expand Down