From b8723c1447e7f646efa1c0808210416ef147506a Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 23 Nov 2015 14:59:09 +0000 Subject: [PATCH] Various changes to search.py Updated it to pull dbconfig from the configuration file Fixed a bug where the connection to get auth keys would fail --- search.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/search.py b/search.py index 59e4c00..2c35e41 100644 --- a/search.py +++ b/search.py @@ -6,20 +6,13 @@ import tweepy, sys import dbconnect import twitterfunctions +from configuration import dbconfig -## enter database connection information -dbconfig = { - 'user': 'bot-twitter', - 'password': 'someSecurePassword', - 'host': '127.0.0.1', - 'database': 'twitterbot', - 'raise_on_warnings': True, -} +getKeySecretQuery = ("SELECT CONSUMER_KEY, CONSUMER_SECRET, ACCESS_KEY, ACCESS_SECRET FROM Accounts WHERE user = 'default'") -authcnx = dbconnect.dbconnect(dbconfig) -authcursor = dbconnect.dbcursor(authcnx) +authcnx=dbconnect.dbconnect(dbconfig) +authcursor=dbconnect.dbcursor(authcnx) -getKeySecretQuery = ("SELECT CONSUMER_KEY, CONSUMER_SECRET, ACCESS_KEY, ACCESS_SECRET FROM Accounts WHERE user = 'default'") gotKeySecretResult = authcursor.execute(getKeySecretQuery) KeySecretResult = authcursor.fetchall() @@ -28,6 +21,7 @@ THE_CONSUMER_SECRET = CONSUMER_SECRET THE_ACCESS_KEY = ACCESS_KEY THE_ACCESS_SECRET = ACCESS_SECRET + api = twitterfunctions.authenticatetwitter(THE_CONSUMER_KEY, THE_CONSUMER_SECRET, THE_ACCESS_KEY, THE_ACCESS_SECRET)