From 58830f141721d636a981afc225b81a662a2e1e86 Mon Sep 17 00:00:00 2001 From: Andrew Herbig Date: Sat, 19 Jun 2010 01:23:09 -0400 Subject: [PATCH] fix some stupid bugs --- core/command.py | 22 +++++++++++----------- modules/example.py | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/command.py b/core/command.py index 97f8013..35679ed 100755 --- a/core/command.py +++ b/core/command.py @@ -104,25 +104,25 @@ def add_first(event, func, cmd_type): logger.debug('add_first(): created new command %s assigned to %s' % (event, func)) event.dispatch('OnCommandAddFirst', event, func, cmd_type) -def delete(event, func, cmd_type): +def delete(eventname, func, cmd_type): '''Remove a function from an event's list of functions.''' - event = event.upper() + eventname = eventname.upper() - if func not in cmd_type[event]['funcs']: + if func not in cmd_type[eventname]['funcs']: return False - cmd_type[event]['funcs'].remove(func) + cmd_type[eventname]['funcs'].remove(func) return True - logger.debug('delete(): deleted command %s assigned to %s' % (event, func)) - event.dispatch('OnCommandDelete', event, func, cmd_type) + logger.debug('delete(): deleted command %s assigned to %s' % (eventname, func)) + event.dispatch('OnCommandDelete', eventname, func, cmd_type) -def delete_first(event, func, cmd_type): +def delete_first(eventname, func, cmd_type): '''Remove a function as an event's first function.''' - event = event.upper() + eventname = eventname.upper() - cmd_type[event]['first'] = None - logger.debug('delete_first(): deleted command %s assigned to %s' % (event, func)) - event.dispatch('OnCommandDeleteFirst', event, func, cmd_type) + cmd_type[eventname]['first'] = None + logger.debug('delete_first(): deleted command %s assigned to %s' % (eventname, func)) + event.dispatch('OnCommandDeleteFirst', eventname, func, cmd_type) diff --git a/modules/example.py b/modules/example.py index bfb537b..6569733 100755 --- a/modules/example.py +++ b/modules/example.py @@ -55,4 +55,4 @@ def module_fini(): command.delete_first('TOPIC', on_topic, command.irc) command.delete('.example', chan_example, command.chan) - command.delete('example', cmdme_currtopic, command.chanme) + command.delete('example', chanme_example, command.chanme) -- 2.11.4.GIT