diff options
| -rwxr-xr-x | be | 30 | ||||
| -rw-r--r-- | libbe/cmdutil.py | 12 |
2 files changed, 21 insertions, 21 deletions
@@ -35,21 +35,21 @@ elif sys.argv[1] == '--version': print _version.version_info["revision_id"] else: try: - try: - sys.exit(cmdutil.execute(sys.argv[1], sys.argv[2:])) - except KeyError, e: - raise cmdutil.UserError("Unknown command \"%s\"" % e.args[0]) - except cmdutil.GetHelp: - print cmdutil.help(sys.argv[1]) - sys.exit(0) - except cmdutil.GetCompletions, e: - print '\n'.join(e.completions) - sys.exit(0) - except cmdutil.UsageError, e: - print "Invalid usage:", e - print "\nArgs:", sys.argv[1:] - print cmdutil.help(sys.argv[1]) - sys.exit(1) + sys.exit(cmdutil.execute(sys.argv[1], sys.argv[2:])) + except cmdutil.GetHelp: + print cmdutil.help(sys.argv[1]) + sys.exit(0) + except cmdutil.GetCompletions, e: + print '\n'.join(e.completions) + sys.exit(0) + except cmdutil.UnknownCommand, e: + print e + sys.exit(1) + except cmdutil.UsageError, e: + print "Invalid usage:", e + print "\nArgs:", sys.argv[1:] + print cmdutil.help(sys.argv[1]) + sys.exit(1) except cmdutil.UserError, e: print "ERROR:" print e diff --git a/libbe/cmdutil.py b/libbe/cmdutil.py index 0dd8ad0..7414e46 100644 --- a/libbe/cmdutil.py +++ b/libbe/cmdutil.py @@ -32,10 +32,10 @@ class UserError(Exception): def __init__(self, msg): Exception.__init__(self, msg) -class UserErrorWrap(UserError): - def __init__(self, exception): - UserError.__init__(self, str(exception)) - self.exception = exception +class UnknownCommand(UserError): + def __init__(self, cmd): + Exception.__init__(self, "Unknown command '%s'" % cmd) + self.cmd = cmd class UsageError(Exception): pass @@ -58,13 +58,13 @@ def get_command(command_name): >>> get_command("asdf") Traceback (most recent call last): - UserError: Unknown command asdf + UnknownCommand: Unknown command asdf >>> repr(get_command("list")).startswith("<module 'becommands.list' from ") True """ cmd = plugin.get_plugin("becommands", command_name.replace("-", "_")) if cmd is None: - raise UserError("Unknown command %s" % command_name) + raise UnknownCommand(command_name) return cmd |