diff -r 503f9a7b7d6c -r 6fc6637d8403 script/utils/search_topsy.py --- a/script/utils/search_topsy.py Sun Apr 21 21:55:06 2013 +0200 +++ b/script/utils/search_topsy.py Tue May 07 18:57:54 2013 +0200 @@ -1,17 +1,15 @@ +from blessings import Terminal from iri_tweet import models, utils -from sqlalchemy.orm import sessionmaker -import anyjson -import sqlite3 -import twitter +from iri_tweet.processor import TwitterProcessorStatus +from optparse import OptionParser +import logging +import math import re import requests -from optparse import OptionParser -import simplejson import time -from blessings import Terminal -import sys -import math -from symbol import except_clause +import twitter + +logger = logging.getLogger(__name__) APPLICATION_NAME = "Tweet recorder user" CONSUMER_KEY = "Vdr5ZcsjI1G3esTPI8yDg" @@ -86,7 +84,7 @@ utils.set_logging(options); - acess_token_key, access_token_secret = utils.get_oauth_token(options.token_filename, application_name=APPLICATION_NAME, consumer_key=CONSUMER_KEY, consumer_secret=CONSUMER_SECRET) + acess_token_key, access_token_secret = utils.get_oauth_token(consumer_key=CONSUMER_KEY, consumer_secret=CONSUMER_SECRET, options.token_filename, application_name=APPLICATION_NAME) t = twitter.Twitter(domain="api.twitter.com", auth=twitter.OAuth(acess_token_key, access_token_secret, CONSUMER_KEY, CONSUMER_SECRET), secure=True) t.secure = True @@ -144,7 +142,7 @@ else: raise - processor = utils.TwitterProcessor(tweet, None, None, session, None, options.token_filename) + processor = TwitterProcessorStatus(tweet, None, None, session, None, options.token_filename, logger) processor.process() session.flush() session.commit()