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

Merge 12eb1610c8 into 8dfb076f11

Browse source
This commit is contained in:
Greg Nofi 2013-04-11 16:44:29 -07:00
commit 17ae17e1b1
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
twython/twython.py
View file

@ -42,17 +42,18 @@ class TwythonError(Exception):
from twython import TwythonError, TwythonAPILimit, TwythonAuthError
"""
def __init__(self, msg, error_code=None, retry_after=None):
self.msg = msg
self.error_code = error_code
if error_code is not None and error_code in twitter_http_status_codes:
self.msg = '%s: %s -- %s' % \
(twitter_http_status_codes[error_code][0],
msg = '%s: %s -- %s' % (twitter_http_status_codes[error_code][0],
twitter_http_status_codes[error_code][1],
self.msg)
msg)
def __str__(self):
return repr(self.msg)
super(TwythonError, self).__init__(msg)
@property
def msg(self):
return self.args[0]
class TwythonAuthError(TwythonError):
@ -67,9 +68,9 @@ class TwythonRateLimitError(TwythonError):
retry_wait_seconds is the number of seconds to wait before trying again.
"""
def __init__(self, msg, error_code, retry_after=None):
TwythonError.__init__(self, msg, error_code=error_code)
if isinstance(retry_after, int):
self.msg = '%s (Retry after %d seconds)' % (msg, retry_after)
msg = '%s (Retry after %d seconds)' % (msg, retry_after)
TwythonError.__init__(self, msg, error_code=error_code)
class Twython(object):