Fix for python 2.4. Release 1.7.1.

diff --git a/setup.py b/setup.py
index b4ca58dca9a0b4addbd1253b6f81501792e9e645..7a80aa3bf1cd1afa57b41935a7052dadad11e2ae 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name="tweepy",
-      version="1.7",
+      version="1.7.1",
       description="Twitter library for python",
       license="MIT",
       author="Joshua Roesslein",

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index 724ed14755e020f344ed9e48fb75fc76be8074c7..9ee3217a83aa266e5eaddafe595895f5040a82d4 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -5,7 +5,7 @@
 """
 Tweepy Twitter API library
 """
-__version__ = '1.7'
+__version__ = '1.7.1'
 __author__ = 'Joshua Roesslein'
 __license__ = 'MIT'
 

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