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

Modifying how error is constructed to make sure it calls init on the

Browse source 
super class
This commit is contained in:
Kelly Slemko 2011-11-09 15:39:02 -08:00
parent f31446fa31
commit 4d4aa302d4
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
twython/twython.py
View file

@ -98,9 +98,9 @@ class RateLimitError(TwythonError):
Raised when you've hit a rate limit. retry_wait_seconds is the number of seconds to Raised when you've hit a rate limit. retry_wait_seconds is the number of seconds to
wait before trying again. wait before trying again.
""" """
def __init__(self, msg, retry_wait_seconds): def __init__(self, msg, retry_wait_seconds, error_code):
self.msg = msg
self.retry_wait_seconds = int(retry_wait_seconds) self.retry_wait_seconds = int(retry_wait_seconds)
TwythonError.__init__(self, msg, error_code)
def __str__(self): def __str__(self):
return repr(self.msg) return repr(self.msg)
@ -321,9 +321,12 @@ class Twython(object):
try: try:
resp, content = self.client.request(searchURL, "GET", headers = self.headers) resp, content = self.client.request(searchURL, "GET", headers = self.headers)
if resp.status == 420: if int(resp.status) == 420:
retry_wait_seconds = resp['retry-after'] retry_wait_seconds = resp['retry-after']
raise RateLimitError("getSearchTimeline() is being rate limited. Retry after %s seconds." % retry_wait_seconds, retry_wait_seconds) raise RateLimitError("getSearchTimeline() is being rate limited. Retry after %s seconds." %
retry_wait_seconds,
retry_wait_seconds,
resp.status)
return simplejson.loads(content.decode('utf-8')) return simplejson.loads(content.decode('utf-8'))
except HTTPError, e: except HTTPError, e: