Browse Source

fix by moving aliases to help

tags/v0.1
Ben Kurtovic 13 years ago
parent
commit
a7d8faa0a0
2 changed files with 12 additions and 13 deletions
  1. +12
    -3
      irc/commands/help.py
  2. +0
    -10
      irc/triggers.py

+ 12
- 3
irc/commands/help.py View File

@@ -2,10 +2,18 @@


"""Generates help information.""" """Generates help information."""


from irc import triggers

connection, data = None, None connection, data = None, None


def get_alias(key):
"""connect command aliases with their file, e.g. so we know !voice corresponds to chanops.py"""
aliases = {
"voice": "chanops",
"devoice": "chanops",
"op": "chanops",
"deop": "chanops",
}
return aliases[key]

def call(c, d): def call(c, d):
global connection, data global connection, data
connection, data = c, d connection, data = c, d
@@ -26,10 +34,11 @@ def do_command_help():
exec "from irc.commands import %s as this_command" % command exec "from irc.commands import %s as this_command" % command
except ImportError: # if we can't find it directly, this could be an alias for another command except ImportError: # if we can't find it directly, this could be an alias for another command
try: try:
this_command = triggers.get_alias(command)
cmd = get_alias(command)
except KeyError: except KeyError:
connection.reply(data.chan, data.nick, "command \x0303%s\x0301 not found!" % command) connection.reply(data.chan, data.nick, "command \x0303%s\x0301 not found!" % command)
return return
exec "from irc.commands import %s as this_command" % cmd


info = this_command.__doc__ info = this_command.__doc__




+ 0
- 10
irc/triggers.py View File

@@ -4,16 +4,6 @@


from irc.commands import test, help, git, link, chanops from irc.commands import test, help, git, link, chanops


def get_alias(key):
"""used by help.py, e.g. so we know !voice corresponds to chanops.py"""
aliases = {
"voice": chanops,
"devoice": chanops,
"op": chanops,
"deop": chanops,
}
return aliases[key]

def check(connection, data, hook): def check(connection, data, hook):
data.parse_args() # parse command arguments into data.command and data.args data.parse_args() # parse command arguments into data.command and data.args




Loading…
Cancel
Save