Import TwitterHTTPError for stream module

[z_archive/twitter.git] / twitter / stream.py

diff --git a/twitter/stream.py b/twitter/stream.py
index e60157c43a57b03cb9a773af026d7fdf1fabe4a7..77f86d01f49dd6f17b281e4da8f079e5f92480e5 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -7,8 +7,10 @@ except ImportError:
     import urllib2 as urllib_error
 import json
 from ssl import SSLError
+import socket
+import sys
 
-from .api import TwitterCall, wrap_response
+from .api import TwitterCall, wrap_response, TwitterHTTPError
 
 class TwitterJSONIter(object):
 
@@ -19,7 +21,11 @@ class TwitterJSONIter(object):
         self.block = block
 
     def __iter__(self):
-        sock = self.handle.fp._sock.fp._sock
+        if sys.version_info >= (3, 0):
+            sock = self.handle.fp.raw._sock
+        else:
+            sock = self.handle.fp._sock.fp._sock
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
         if not self.block:
             sock.setblocking(False)
         while True:
@@ -51,11 +57,11 @@ def handle_stream_response(req, uri, arg_data, block):
     return iter(TwitterJSONIter(handle, uri, arg_data, block))
 
 class TwitterStreamCall(TwitterCall):
-    def _handle_response(self, req, uri, arg_data):
+    def _handle_response(self, req, uri, arg_data, _timeout=None):
         return handle_stream_response(req, uri, arg_data, block=True)
 
 class TwitterStreamCallNonBlocking(TwitterCall):
-    def _handle_response(self, req, uri, arg_data):
+    def _handle_response(self, req, uri, arg_data, _timeout=None):
         return handle_stream_response(req, uri, arg_data, block=False)
 
 class TwitterStream(TwitterStreamCall):
@@ -66,7 +72,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:
@@ -81,7 +87,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),)