Fix error message parsing.

diff --git a/tweepy/binder.py b/tweepy/binder.py
index 437e2c3ba72819ff38006f89e2b5fea52dcf5094..c24a48322c1c3277da9660d90bd3fa7da4f2b6e4 100644 (file)
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -155,7 +155,7 @@ def bind_api(**config):
             self.api.last_response = resp
             if resp.status != 200:
                 try:
-                    error_msg = self.api.parser.parse_error(self, resp.read())
+                    error_msg = self.api.parser.parse_error(resp.read())
                 except Exception:
                     error_msg = "Twitter error response: status code = %s" % resp.status
                 raise TweepError(error_msg, resp)

diff --git a/tweepy/parsers.py b/tweepy/parsers.py
index 24b73a3c109f63d679ad6c2b418fec7a1a2336bc..22b30266226234bfdc78db4775f4814ed33fc66e 100644 (file)
--- a/tweepy/parsers.py
+++ b/tweepy/parsers.py
@@ -45,7 +45,8 @@ class JSONParser(Parser):
             return json
 
     def parse_error(self, payload):
-        return self.json_lib.loads(payload)['error']
+        error = self.json_lib.loads(payload)
+        return error['error'] if error.has_key('error') else error['errors']
 
 
 class ModelParser(JSONParser):