add support to initialise NTEnum like NTScalar #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdavidsaver
requested changes
Aug 22, 2024
src/p4p/nt/enum.py
Outdated
| @@ -67,8 +67,12 @@ def wrap(self, value, choices=None, **kws): | |||
| V['value.choices'] = choices | |||
|
|
|||
| if isinstance(value, dict): | |||
| # assume dict of index and choices list | |||
| V.value = value | |||
| if value.keys() == set(['index', 'choices']): | |||
There was a problem hiding this comment.
This test seems unnecessarily strict. It is valid to update either 'index' or 'choices' independently, or to add custom fields. Updating only 'index' is likely the most common case.
There was a problem hiding this comment.
See my comment below about the failing testDictionaryOfValueWrap() test.
m2es3h
commented
Aug 22, 2024
| @@ -267,18 +267,41 @@ def testSubStore(self): | |||
| self.assertEqual(V.a.value.index, 1) | |||
| self.assertEqual(V.b.value.index, 0) | |||
|
|
|||
| def testWrap(self): | |||
| def testDictionaryOfValueWrap(self): | |||
| W = nt.NTEnum() | |||
| V = W.wrap({'index':1, 'choices':['X','Y']}) | |||
There was a problem hiding this comment.
This existing test fails because it goes through the isinstance(value, dict) branch in NTEnum.wrap(), which now expects 'value.index' and/or 'value.choices' like NTScalar.wrap() does. Should I update this test, or should NTEnum.wrap() be able to handle a dictionary that only contains fields meant for the Value.value?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When initialising an NTEnum with a python dict, it is assumed that the dict is meant for the Value.value and contains
indexandchoiceskeys for the value. This PR adds ability to initialise value and any other fields of the NTEnum, similar to initialising an NTScalar.