This commit is contained in:
neersighted 2012-02-28 21:09:40 -08:00
parent c014d91ec2
commit eec12aa9e4
7 changed files with 28 additions and 18 deletions

View file

@ -38,8 +38,8 @@ if not os.path.exists('config'):
"bitly_api": "INSERT API KEY FROM bitly.com HERE",
"wolframalpha": "INSERT API KEY FROM wolframalpha.com HERE",
"lastfm": "INSERT API KEY FROM lastfm HERE",
"mc_user": "INSERT MINECRAFT USERNAME HERE (used to check login servers in mctools.py)",
"mc_pass": "INSERT MINECRAFT PASSWORD HERE (used to check login servers in mctools.py)"
"mc_user": "INSERT MINECRAFT USERNAME HERE",
"mc_pass": "INSERT MINECRAFT PASSWORD HERE"
},
"censored_strings":
[
@ -50,11 +50,11 @@ if not os.path.exists('config'):
}''') + '\n')
print "Config generated!"
print "Please edit the config now!"
print "(The default config will work, but you most likely want to change it)"
print "For help, see http://git.io/cloudbotwiki"
print "Thank you for using CloudBot!"
sys.exit()
def config():
# reload config from file if file has changed
config_mtime = os.stat('config').st_mtime

View file

@ -2,7 +2,8 @@ import os
import sqlite3
import thread
threaddbs={}
threaddbs = {}
def get_db_connection(conn, name=''):
"returns an sqlite3 connection to a persistent database"

View file

@ -247,4 +247,4 @@ class SSLIRC(IRC):
IRC.__init__(self, server, nick, port, channels, conf)
def create_connection(self):
return crlf_ssl_tcp(self.server, self.port, self.ignore_cert_errors)
return crlf_ssl_tcp(self.server, self.port, self.ignore_cert_errors)

View file

@ -15,7 +15,7 @@ class Input(dict):
def say(msg):
conn.msg(chan, msg)
def pm(msg):
conn.msg(nick, msg)