diff options
| author | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2020-09-03 23:21:50 -0400 |
|---|---|---|
| committer | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2020-09-03 23:21:50 -0400 |
| commit | 7d3f27273e64f4c30852ea1f7fe0b79520f6cc7e (patch) | |
| tree | 340a418a46e66c407898fc91fea4813b6f5161a0 /cmd2/cmd2.py | |
| parent | f1ac4d0fb0e6cccbc0e180b6d3320f48015fad41 (diff) | |
| parent | de0261325a91dfdbe1571135ce078a978a2aaad8 (diff) | |
| download | cmd2-git-7d3f27273e64f4c30852ea1f7fe0b79520f6cc7e.tar.gz | |
Merge branch '2.0' into read_input
Diffstat (limited to 'cmd2/cmd2.py')
| -rw-r--r-- | cmd2/cmd2.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index fba516e0..a8a84499 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -539,7 +539,9 @@ class Cmd(cmd.Cmd): self._installed_command_sets.append(cmdset) self._register_subcommands(cmdset) + cmdset.on_registered() except Exception: + cmdset.on_unregister() for attrib in installed_attributes: delattr(self, attrib) if cmdset in self._installed_command_sets: @@ -547,7 +549,7 @@ class Cmd(cmd.Cmd): if cmdset in self._cmd_to_command_sets.values(): self._cmd_to_command_sets = \ {key: val for key, val in self._cmd_to_command_sets.items() if val is not cmdset} - cmdset.on_unregister() + cmdset.on_unregistered() raise def _install_command_function(self, command: str, command_wrapper: Callable, context=''): @@ -595,6 +597,7 @@ class Cmd(cmd.Cmd): """ if cmdset in self._installed_command_sets: self._check_uninstallable(cmdset) + cmdset.on_unregister() self._unregister_subcommands(cmdset) methods = inspect.getmembers( @@ -620,7 +623,7 @@ class Cmd(cmd.Cmd): if hasattr(self, HELP_FUNC_PREFIX + cmd_name): delattr(self, HELP_FUNC_PREFIX + cmd_name) - cmdset.on_unregister() + cmdset.on_unregistered() self._installed_command_sets.remove(cmdset) def _check_uninstallable(self, cmdset: CommandSet): |