From 138c6ceb1e533010096ebdc2540ec7a87c7f6328 Mon Sep 17 00:00:00 2001
From: Ivo Wetzel <ivo.wetzel@googlemail.com>
Date: Wed, 10 Mar 2010 17:31:40 -0600
Subject: [PATCH] Fix error message parsing.

---
 tweepy/binder.py  | 2 +-
 tweepy/parsers.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tweepy/binder.py b/tweepy/binder.py
index 437e2c3..c24a483 100644
--- 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 24b73a3..22b3026 100644
--- 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):
-- 
2.25.1