Merge pull request #226 from hugovk/master

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

diff --git a/twitter/stream_example.py b/twitter/stream_example.py
index 0996ea1c92212ebbf98d1b07e4f68223f69ac259..4e5184c335520c9ab1cfa7819a6d83f3470ab172 100644 (file)
--- a/twitter/stream_example.py
+++ b/twitter/stream_example.py
@@ -9,9 +9,9 @@ import argparse
 
 from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.oauth import OAuth
+from twitter.oauth2 import OAuth2, read_bearer_token_file
 from twitter.util import printNicely
 
-
 def parse_arguments():
 
     parser = argparse.ArgumentParser(description=__doc__ or "")
@@ -40,16 +40,20 @@ def main():
         block=not args.no_block,
         heartbeat_timeout=args.heartbeat_timeout)
 
+    query_args = dict()
+    if args.track_keywords:
+        query_args['track'] = args.track_keywords
+
     if args.user_stream:
         stream = TwitterStream(auth=auth, domain='userstream.twitter.com', **stream_args)
-        tweet_iter = stream.user()
+        tweet_iter = stream.user(**query_args)
     elif args.site_stream:
         stream = TwitterStream(auth=auth, domain='sitestream.twitter.com', **stream_args)
-        tweet_iter = stream.site()
+        tweet_iter = stream.site(**query_args)
     else:
         stream = TwitterStream(auth=auth, **stream_args)
         if args.track_keywords:
-            tweet_iter = stream.statuses.filter(track=args.track_keywords)
+            tweet_iter = stream.statuses.filter(**query_args)
         else:
             tweet_iter = stream.statuses.sample()