Refactor get_and_merge_cmdsets to merge all cmdsets in one place rather than sub-merging them separately on each object first. See #1087. Also changes the names of the auto-added _exitset to ExitCmdSet and _channelset to ChannelCmdSet. Allow Channel cmdsets to also be identified on Objects.

This commit is contained in:
Griatch 2016-10-09 14:25:38 +02:00
parent bac6c7f234
commit edacd58eab
5 changed files with 125 additions and 73 deletions

View file

@ -1684,7 +1684,7 @@ class DefaultExit(DefaultObject):
obj=exidbobj)
# create a cmdset
exit_cmdset = cmdset.CmdSet(None)
exit_cmdset.key = '_exitset'
exit_cmdset.key = 'ExitCmdSet'
exit_cmdset.priority = self.priority
exit_cmdset.duplicates = True
# add command to cmdset