From: Joshua Roesslein <jroesslein@gmail.com>
Date: Sun, 31 Jan 2010 01:45:33 +0000 (-0600)
Subject: Stream.py now imports json library with utility function.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=79e92ebb8d83166b50ab3cbec3d07683b536156d;p=tweepy.git

Stream.py now imports json library with utility function.
---

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index d81ed88..8343f0e 100644
--- 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