projects
/
tweepy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ac04f3
)
Modified another json import to work on app engine
author
Thomas Bohmbach, Jr
<thomas@gumption.com>
Mon, 14 Sep 2009 19:43:24 +0000
(14:43 -0500)
committer
Thomas Bohmbach, Jr
<thomas@gumption.com>
Mon, 14 Sep 2009 19:43:24 +0000
(14:43 -0500)
tweepy/streaming.py
patch
|
blob
|
blame
|
history
diff --git
a/tweepy/streaming.py
b/tweepy/streaming.py
index fcfc7fc25d52e7131001e9534205b309639f7a52..947d633e27a973dae483b7f311dbfce1340e2d84 100644
(file)
--- 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