repos/twython
1
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

Merge pull request #232 from hades/master

Browse source 
wrap requests exceptions in TwythonError class
This commit is contained in:
Mike Helmick 2013-06-25 12:53:44 -07:00
commit e786e59050
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
twython/api.py
View file

@ -9,6 +9,8 @@ Twitter Authentication, and miscellaneous methods that are useful when
dealing with the Twitter API dealing with the Twitter API
""" """
import sys
import requests import requests
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
from requests_oauthlib import OAuth1, OAuth2 from requests_oauthlib import OAuth1, OAuth2
@ -131,7 +133,10 @@ class Twython(EndpointsMixin, object):
'data': params, 'data': params,
'files': files, 'files': files,
}) })
try:
response = func(url, **requests_args) response = func(url, **requests_args)
except requests.RequestException as e:
raise TwythonError, str(e), sys.exc_info()[2]
content = response.content.decode('utf-8') content = response.content.decode('utf-8')
# create stash for last function intel # create stash for last function intel