diff options
| -rw-r--r-- | ipalib/cli.py | 17 | ||||
| -rw-r--r-- | ipalib/startup.py | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index ad54d77a..a0b8800f 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -49,6 +49,8 @@ def _(arg): class CLI(object): + __d = None + def __init__(self, api): self.__api = api @@ -61,12 +63,23 @@ class CLI(object): print to_cli(cmd.name) def __contains__(self, key): - return from_cli(key) in self.api.cmd + assert self.__d is not None, 'you must call finalize() first' + return key in self.__d def __getitem__(self, key): - return self.api.cmd[from_cli(key)] + assert self.__d is not None, 'you must call finalize() first' + return self.__d[key] + + def finalize(self): + api = self.api + api.finalize() + def d_iter(): + for cmd in api.cmd: + yield (to_cli(cmd.name), cmd) + self.__d = dict(d_iter()) def run(self): + self.finalize() if len(sys.argv) < 2: self.print_commands() print 'Usage: ipa COMMAND [OPTIONS]' diff --git a/ipalib/startup.py b/ipalib/startup.py index cfeb57b1..4879a8e6 100644 --- a/ipalib/startup.py +++ b/ipalib/startup.py @@ -27,5 +27,3 @@ unnecessary side effects (needed for unit tests, among other things). from run import api import plugins - -api.finalize() |