Try using simplejson first, and if not found then try using built-in json module.

diff --git a/tweepy/binder.py b/tweepy/binder.py
index 8858ad13e9e7c47ba4b28364dc1b616eb3ddb4a0..339a835174f701b9f8b1d9c80df9570fb9171677 100644 (file)
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -10,13 +10,13 @@ from tweepy.parsers import parse_error
 from tweepy.error import TweepError
 
 try:
-    import json #Python >= 2.6
+    import simplejson as json
 except ImportError:
     try:
-        import simplejson as json #Python < 2.6
+        import json  # Python 2.6+
     except ImportError:
         try:
-            from django.utils import simplejson as json #Google App Engine
+            from django.utils import simplejson as json  # Google App Engine
         except ImportError:
             raise ImportError, "Can't load a json library"
 

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index ddb72ea4be65b067caa27619f6cda9eb20a637ab..de5e8188923ac6c078a9782c465ad3fe64e969ab 100644 (file)
--- a/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@ -14,13 +14,13 @@ from tweepy.api import API
 from tweepy.error import TweepError
 
 try:
-    import json #Python >= 2.6
+    import simplejson as json
 except ImportError:
     try:
-        import simplejson as json #Python < 2.6
+        import json  # Python 2.6+
     except ImportError:
         try:
-            from django.utils import simplejson as json #Google App Engine
+            from django.utils import simplejson as json  # Google App Engine
         except ImportError:
             raise ImportError, "Can't load a json library"