eryn/ubot2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use string .format and make debug more useful

Browse source
This commit is contained in:
Ryan Huber 2014-11-22 12:40:01 -08:00
parent ddabcfa8e1
commit 2dcb4c575b
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rtmbot.py
View file

@ -37,7 +37,7 @@ class RtmBot(object):
def input(self, data): def input(self, data):
if "type" in data: if "type" in data:
function_name = "process_" + data["type"] function_name = "process_" + data["type"]
dbg(function_name) dbg("got {}".format(function_name))
for plugin in self.bot_plugins: for plugin in self.bot_plugins:
plugin.do(function_name, data) plugin.do(function_name, data)
def output(self): def output(self):
@ -45,7 +45,7 @@ class RtmBot(object):
for output in plugin.do_output(): for output in plugin.do_output():
channel = self.slack_client.server.channels.find(output[0]) channel = self.slack_client.server.channels.find(output[0])
if channel != None: if channel != None:
channel.send_message("%s" % output[1]) channel.send_message("{}".format(output[1]))
else: else:
raise UnknownChannel raise UnknownChannel
def crons(self): def crons(self):
@ -80,10 +80,14 @@ class Plugin(object):
self.module.crontable = [] self.module.crontable = []
def do(self, function_name, data): def do(self, function_name, data):
if function_name in dir(self.module): if function_name in dir(self.module):
try: #this makes the plugin fail with stack trace in debug mode
if not debug:
try:
eval("self.module."+function_name)(data)
except:
dbg("problem in module {} {}".format(function_name, data))
else:
eval("self.module."+function_name)(data) eval("self.module."+function_name)(data)
except:
dbg("problem in module")
if "catch_all" in dir(self.module): if "catch_all" in dir(self.module):
try: try:
self.module.catch_all(data) self.module.catch_all(data)
@ -110,7 +114,7 @@ class Job(object):
self.interval = interval self.interval = interval
self.lastrun = 0 self.lastrun = 0
def __str__(self): def __str__(self):
return "%s %s %s" % (self.function, self.interval, self.lastrun) return "{} {} {}".format(self.function, self.interval, self.lastrun)
def __repr__(self): def __repr__(self):
return self.__str__() return self.__str__()
def check(self): def check(self):