projects
/
tweepy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
680ab39
)
Stream.py now imports json library with utility function.
author
Joshua Roesslein
<jroesslein@gmail.com>
Sun, 31 Jan 2010 01:45:33 +0000
(19:45 -0600)
committer
Joshua Roesslein
<jroesslein@gmail.com>
Sun, 31 Jan 2010 01:45:33 +0000
(19:45 -0600)
tweepy/streaming.py
patch
|
blob
|
blame
|
history
diff --git
a/tweepy/streaming.py
b/tweepy/streaming.py
index d81ed88c669e26cf5d7101b63268ebc6714d481a..8343f0e9852437cccc72cb96b349049183510aa5 100644
(file)
--- a/
tweepy/streaming.py
+++ b/
tweepy/streaming.py
@@
-13,16
+13,8
@@
from tweepy.models import Status
from tweepy.api import API
from tweepy.error import TweepError
-try:
- import simplejson as json
-except ImportError:
- try:
- import 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"
+from tweepy.utils import import_simplejson
+json = import_simplejson()
STREAM_VERSION = 1