From: Thomas Bohmbach, Jr <thomas@gumption.com>
Date: Mon, 14 Sep 2009 19:43:24 +0000 (-0500)
Subject: Modified another json import to work on app engine
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=12e03dc6f498339f7edfb9a2786a4d7b74ff1425;p=tweepy.git

Modified another json import to work on app engine
---

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index fcfc7fc..947d633 100644
--- a/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@ -13,9 +13,15 @@ from . api import API
 from . error import TweepError
 
 try:
-    import json
+    import json #Python >= 2.6
 except ImportError:
-    import simplejson as json
+    try:
+        import simplejson as json #Python < 2.6
+    except ImportError:
+        try:
+            from django.utils import simplejson as json #Google App Engine
+        except ImportError:
+            raise ImportError, "Can't load a json library"
 
 STREAM_VERSION = 1