1.1 as default in stream. Give up on simplejson.

diff --git a/twitter/api.py b/twitter/api.py
index ba9ce5d98b2425607a598205b2d2c344fa6c4887..547bcfa73e650ee206dfb7366b61fd5fabe069c3 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -21,10 +21,7 @@ try:
 except ImportError:
     import httplib as http_client
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+import json
 
 
 class _DEFAULT(object):

diff --git a/twitter/stream.py b/twitter/stream.py
index 45b46c0e1bab19e518dd25bcc697c67ea7b3a588..2f1e4f5f988baeaa5c5e08aacc1a6a08a3ad06f1 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -68,7 +68,7 @@ class TwitterStream(TwitterStreamCall):
     iterator that yields objects decoded from the stream. For
     example::
 
-        twitter_stream = TwitterStream(auth=UserPassAuth('joe', 'joespassword'))
+        twitter_stream = TwitterStream(auth=OAuth(...))
         iterator = twitter_stream.statuses.sample()
 
         for tweet in iterator:
@@ -83,7 +83,7 @@ class TwitterStream(TwitterStreamCall):
     """
     def __init__(
         self, domain="stream.twitter.com", secure=True, auth=None,
-        api_version='1', block=True):
+        api_version='1.1', block=True):
         uriparts = ()
         uriparts += (str(api_version),)