X-Git-Url: https://projects.mako.cc/source/twitter-api-cdsw/blobdiff_plain/4c43c9724c25c3d919cb535973559fab1f1c0a7b..HEAD:/tweepy/error.py

diff --git a/tweepy/error.py b/tweepy/error.py
index 753e2fe..7827029 100644
--- a/tweepy/error.py
+++ b/tweepy/error.py
@@ -2,14 +2,30 @@
 # Copyright 2009-2010 Joshua Roesslein
 # See LICENSE for details.
 
+from __future__ import print_function
+
+import six
+
 class TweepError(Exception):
     """Tweepy exception"""
 
     def __init__(self, reason, response=None):
-        self.reason = unicode(reason)
+        self.reason = six.text_type(reason)
         self.response = response
         Exception.__init__(self, reason)
 
     def __str__(self):
         return self.reason
 
+def is_rate_limit_error_message(message):
+    """Check if the supplied error message belongs to a rate limit error."""
+    return isinstance(message, list) \
+        and len(message) > 0 \
+        and 'code' in message[0] \
+        and message[0]['code'] == 88
+
+class RateLimitError(TweepError):
+    """Exception for Tweepy hitting the rate limit."""
+    # RateLimitError has the exact same properties and inner workings
+    # as TweepError for backwards compatibility reasons.
+    pass