Formatting, updated copyright.
This commit is contained in:
parent
8769b97dc0
commit
146ae3c279
1 changed files with 8 additions and 7 deletions
15
bot.py
15
bot.py
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
__author__ = "ClouDev"
|
__author__ = "ClouDev"
|
||||||
__authors__ = ["Lukeroge", "neersighted"]
|
__authors__ = ["Lukeroge", "neersighted"]
|
||||||
__copyright__ = "Copyright 2012, ClouDev"
|
__copyright__ = "Copyright 2012-2013, ClouDev"
|
||||||
__credits__ = ["thenoodle", "_frozen", "rmmh"]
|
__credits__ = ["thenoodle", "_frozen", "rmmh"]
|
||||||
__license__ = "GPL v3"
|
__license__ = "GPL v3"
|
||||||
__version__ = "DEV"
|
__version__ = "DEV"
|
||||||
|
@ -24,6 +24,7 @@ os.chdir(sys.path[0] or '.') # do stuff relative to the install directory
|
||||||
class Bot(object):
|
class Bot(object):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
print 'CloudBot %s (%s) <http://git.io/cloudbotirc>' % (__version__, __status__)
|
print 'CloudBot %s (%s) <http://git.io/cloudbotirc>' % (__version__, __status__)
|
||||||
|
|
||||||
# print debug info
|
# print debug info
|
||||||
|
@ -33,8 +34,8 @@ python_ver = platform.python_version()
|
||||||
architecture = ' '.join(platform.architecture())
|
architecture = ' '.join(platform.architecture())
|
||||||
|
|
||||||
print "Operating System: %s, Python " \
|
print "Operating System: %s, Python " \
|
||||||
"Version: %s %s, Architecture: %s" \
|
"Version: %s %s, Architecture: %s" \
|
||||||
"" % (opsys, python_imp, python_ver, architecture)
|
"" % (opsys, python_imp, python_ver, architecture)
|
||||||
|
|
||||||
bot = Bot()
|
bot = Bot()
|
||||||
bot.vars = {}
|
bot.vars = {}
|
||||||
|
@ -44,7 +45,7 @@ print 'Loading plugins...'
|
||||||
|
|
||||||
# bootstrap the reloader
|
# bootstrap the reloader
|
||||||
eval(compile(open(os.path.join('core', 'reload.py'), 'U').read(),
|
eval(compile(open(os.path.join('core', 'reload.py'), 'U').read(),
|
||||||
os.path.join('core', 'reload.py'), 'exec'))
|
os.path.join('core', 'reload.py'), 'exec'))
|
||||||
reload(init=True)
|
reload(init=True)
|
||||||
|
|
||||||
config()
|
config()
|
||||||
|
@ -63,11 +64,11 @@ try:
|
||||||
print 'Connecting to server: %s' % conf['server']
|
print 'Connecting to server: %s' % conf['server']
|
||||||
if conf.get('ssl'):
|
if conf.get('ssl'):
|
||||||
bot.conns[name] = SSLIRC(name, conf['server'], conf['nick'], conf=conf,
|
bot.conns[name] = SSLIRC(name, conf['server'], conf['nick'], conf=conf,
|
||||||
port=conf.get('port', 6667), channels=conf['channels'],
|
port=conf.get('port', 6667), channels=conf['channels'],
|
||||||
ignore_certificate_errors=conf.get('ignore_cert', True))
|
ignore_certificate_errors=conf.get('ignore_cert', True))
|
||||||
else:
|
else:
|
||||||
bot.conns[name] = IRC(name, conf['server'], conf['nick'], conf=conf,
|
bot.conns[name] = IRC(name, conf['server'], conf['nick'], conf=conf,
|
||||||
port=conf.get('port', 6667), channels=conf['channels'])
|
port=conf.get('port', 6667), channels=conf['channels'])
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print 'ERROR: malformed config file', e
|
print 'ERROR: malformed config file', e
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
Reference in a new issue