--- a/script/utils/merge_tweets.py	Tue Oct 01 16:51:32 2013 +0200
+++ b/script/utils/merge_tweets.py	Mon Oct 21 12:38:23 2013 +0200
@@ -19,9 +19,9 @@
                         help="log to file", metavar="LOG", default="stderr")
     parser.add_argument("-v", dest="verbose", action="count",
                         help="verbose", default=0)
-    parser.add_option("-k", "--key", dest="consumer_key",
+    parser.add_argument("-k", "--key", dest="consumer_key",
                       help="Twitter consumer key", metavar="CONSUMER_KEY")
-    parser.add_option("-s", "--secret", dest="consumer_secret",
+    parser.add_argument("-s", "--secret", dest="consumer_secret",
                       help="Twitter consumer secret", metavar="CONSUMER_SECRET")
     parser.add_argument("-q", dest="quiet", action="count",
                         help="quiet", default=0)
@@ -39,8 +39,8 @@
 
 if __name__ == "__main__":
     
-    sys.stdout = codecs.getwriter(sys.stdout.encoding)(sys.stdout)
-    
+    #sys.stdout = codecs.getwriter(sys.stdout.encoding)(sys.stdout)
+    writer = None
     options = get_option()
     
     access_token = None
@@ -99,7 +99,7 @@
                 session_tgt.flush()
                 
             ptext = progress_text + tweet.text
-            show_progress(i+1, count_tw, ptext.replace("\n",""), 70)
+            writer = show_progress(i+1, count_tw, ptext.replace("\n",""), 70, writer)
                             
         session_tgt.commit()
         print u"%d new tweet added" % (added)