Merge https://github.com/sixohsix/twitter into pr-rouxrc

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

diff --git a/twitter/stream_example.py b/twitter/stream_example.py
index 5f2dbdf5d80ee97acfe4d1cfe38a862e21f9574a..2888aced4c05e8681ab5bca63c1dcc640e991699 100644 (file)
--- a/twitter/stream_example.py
+++ b/twitter/stream_example.py
@@ -30,13 +30,13 @@ def parse_arguments():
 
     return parser.parse_args()
 
-##  parse_arguments()
-
-
 def main():
-
     args = parse_arguments()
 
+    if not all((args.token, args.token_secret, args.consumer_key, args.consumer_secret)):
+        print(__doc__)
+        return 2
+
     # When using twitter stream you must authorize.
     auth = OAuth(args.token, args.token_secret, args.consumer_key, args.consumer_secret)
     if args.user_stream:
@@ -46,7 +46,7 @@ def main():
         stream = TwitterStream(auth=auth, domain='sitestream.twitter.com')
         tweet_iter = stream.site()
     else:
-        stream = TwitterStream(auth=auth)
+        stream = TwitterStream(auth=auth, timeout=60.0)
         tweet_iter = stream.statuses.sample()
 
     # Iterate over the sample stream.
@@ -56,7 +56,5 @@ def main():
         if tweet.get('text'):
             printNicely(tweet['text'])
 
-##  main()
-
 if __name__ == '__main__':
     main()