Skip to content

Use enum's constructor to resolve enum values #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use enum's constructor to resolve enum values #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions dbus_next/_private/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ class HeaderField(Enum):
SENDER = 7
SIGNATURE = 8
UNIX_FDS = 9


HEADER_NAME_MAP = {field.value: field.name for field in HeaderField}
9 changes: 4 additions & 5 deletions dbus_next/_private/unmarshaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
LITTLE_ENDIAN,
BIG_ENDIAN,
PROTOCOL_VERSION,
HEADER_NAME_MAP,
)
from ..constants import MessageType, MessageFlag, MESSAGE_FLAG_MAP, MESSAGE_TYPE_MAP
from ..constants import MessageType, MessageFlag
from ..signature import SignatureTree, SignatureType, Variant
from ..errors import InvalidMessageError

Expand Down Expand Up @@ -233,7 +232,7 @@ def header_fields(self, header_length):
o = self.offset + 1
self.offset += signature_len + 2 # one for the byte, one for the '\0'
tree = SignatureTree._get(self.buf[o:o + signature_len].decode())
headers[HEADER_NAME_MAP[field_0]] = self.read_argument(tree.types[0])
headers[HeaderField(field_0).name] = self.read_argument(tree.types[0])
return headers

def _read_header(self):
Expand All @@ -243,8 +242,8 @@ def _read_header(self):
self.read_to_offset(HEADER_SIGNATURE_SIZE)
buffer = self.buf
endian = buffer[0]
self.message_type = MESSAGE_TYPE_MAP[buffer[1]]
self.flag = MESSAGE_FLAG_MAP[buffer[2]]
self.message_type = MessageType(buffer[1])
self.flag = MessageFlag(buffer[2])
protocol_version = buffer[3]

if endian != LITTLE_ENDIAN and endian != BIG_ENDIAN:
Expand Down
6 changes: 0 additions & 6 deletions dbus_next/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ class MessageType(Enum):
SIGNAL = 4 #: A broadcast signal to subscribed connections


MESSAGE_TYPE_MAP = {field.value: field for field in MessageType}


class MessageFlag(IntFlag):
"""Flags that affect the behavior of sent and received messages
"""
Expand All @@ -29,9 +26,6 @@ class MessageFlag(IntFlag):
ALLOW_INTERACTIVE_AUTHORIZATION = 4


MESSAGE_FLAG_MAP = {field.value: field for field in MessageFlag}


class NameFlag(IntFlag):
"""A flag that affects the behavior of a name request.
"""
Expand Down