Use enum's constructor to resolve enum values#143
Open
whot wants to merge 1 commit intoaltdesktop:masterfrom
Open
Use enum's constructor to resolve enum values#143whot wants to merge 1 commit intoaltdesktop:masterfrom
whot wants to merge 1 commit intoaltdesktop:masterfrom
Conversation
Rather than creating a map of {value: enum}, let's just use Foo(value)
to resolve to the respective enum value.
This fixes a regression with introspection introduced in
commit 3282eed "Improve unmarshall performance":
File "dbus_next/_private/unmarshaller.py", line 247, in _read_header
self.flag = MESSAGE_FLAG_MAP[buffer[2]]
~~~~~~~~~~~~~~~~^^^^^^^^^^^
KeyError: 0
MESSAGE_FLAG_MAP is built like this:
MESSAGE_FLAG_MAP = {field.value: field for field in MessageFlag}
But MessageFlag is a IntFlag, so the zero value (NONE) is missing from
the iterator:
>>> [f for f in dbus_next.constants.MessageFlag]
[<MessageFlag.NO_REPLY_EXPECTED: 1>, <MessageFlag.NO_AUTOSTART: 2>,
<MessageFlag.ALLOW_INTERACTIVE_AUTHORIZATION: 4>]
Resolving the enum through the constructor fixes this. MESSAGE_TYPE_MAP
and HEADER_NAME_MAP are changed in solidarity.
Fixes altdesktop#142
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Rather than creating a map of
{value: enum}, let's just useFoo(value)to resolve to the respective enum value.This fixes a regression with introspection introduced in commit 3282eed "Improve unmarshall performance":
MESSAGE_FLAG_MAP is built like this:
But MessageFlag is a IntFlag, so the zero value (NONE) is missing from the iterator:
Resolving the enum through the constructor fixes this. MESSAGE_TYPE_MAP and HEADER_NAME_MAP are changed in solidarity.
Fixes #142