forked from altdesktop/python-dbus-next
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use enum's constructor to resolve enum values
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
- Loading branch information
Showing
3 changed files
with
4 additions
and
14 deletions.
There are no files selected for viewing
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
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
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