Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development

release-1.0.0
DustyP 8 years ago
commit f6864ddc0a

@ -64,10 +64,10 @@ class Geeksbot(commands.Bot):
self.gcs_service = build('customsearch', 'v1', developerKey=self.bot_secrets['google_search_key']) self.gcs_service = build('customsearch', 'v1', developerKey=self.bot_secrets['google_search_key'])
async def connect_db(self): async def connect_db(self):
self.db_con = await asyncpg.connect(host={self.bot_secrets['db_con']['host']}, self.db_con = await asyncpg.connect(host=self.bot_secrets['db_con']['host'],
database={self.bot_secrets['db_con']['db_name']}, database=self.bot_secrets['db_con']['db_name'],
user={self.bot_secrets['db_con']['user']}, user=self.bot_secrets['db_con']['user'],
password={self.bot_secrets['db_con']['password']}) password=self.bot_secrets['db_con']['password'])
@staticmethod @staticmethod
async def get_custom_prefix(bot_inst, message): async def get_custom_prefix(bot_inst, message):

Loading…
Cancel
Save