Apply black formatting

This commit is contained in:
Nat Noordanus 2020-04-03 19:26:31 +02:00
parent 203105f048
commit b2b36c8575
2 changed files with 38 additions and 42 deletions

View File

@ -712,7 +712,9 @@ class Message(ABC):
def FromString(cls: Type[T], data: bytes) -> T: def FromString(cls: Type[T], data: bytes) -> T:
return cls().parse(data) return cls().parse(data)
def to_dict(self, casing: Casing = Casing.CAMEL, include_default_values: bool = False) -> dict: def to_dict(
self, casing: Casing = Casing.CAMEL, include_default_values: bool = False
) -> dict:
""" """
Returns a dict representation of this message instance which can be Returns a dict representation of this message instance which can be
used to serialize to e.g. JSON. Defaults to camel casing for used to serialize to e.g. JSON. Defaults to camel casing for

View File

@ -191,25 +191,22 @@ def test_to_dict_default_values():
test = TestMessage().from_dict({}) test = TestMessage().from_dict({})
assert test.to_dict(include_default_values=True) == { assert test.to_dict(include_default_values=True) == {
'someInt': 0, "someInt": 0,
'someDouble': 0.0, "someDouble": 0.0,
'someStr': '', "someStr": "",
'someBool': False "someBool": False,
} }
# All default values # All default values
test = TestMessage().from_dict({ test = TestMessage().from_dict(
'someInt': 0, {"someInt": 0, "someDouble": 0.0, "someStr": "", "someBool": False}
'someDouble': 0.0, )
'someStr': '',
'someBool': False
})
assert test.to_dict(include_default_values=True) == { assert test.to_dict(include_default_values=True) == {
'someInt': 0, "someInt": 0,
'someDouble': 0.0, "someDouble": 0.0,
'someStr': '', "someStr": "",
'someBool': False "someBool": False,
} }
# Some default and some other values # Some default and some other values
@ -224,26 +221,28 @@ def test_to_dict_default_values():
some_default_str: str = betterproto.string_field(7) some_default_str: str = betterproto.string_field(7)
some_default_bool: bool = betterproto.bool_field(8) some_default_bool: bool = betterproto.bool_field(8)
test = TestMessage2().from_dict({ test = TestMessage2().from_dict(
'someInt': 2, {
'someDouble': 1.2, "someInt": 2,
'someStr': 'hello', "someDouble": 1.2,
'someBool': True, "someStr": "hello",
'someDefaultInt': 0, "someBool": True,
'someDefaultDouble': 0.0, "someDefaultInt": 0,
'someDefaultStr': '', "someDefaultDouble": 0.0,
'someDefaultBool': False "someDefaultStr": "",
}) "someDefaultBool": False,
}
)
assert test.to_dict(include_default_values=True) == { assert test.to_dict(include_default_values=True) == {
'someInt': 2, "someInt": 2,
'someDouble': 1.2, "someDouble": 1.2,
'someStr': 'hello', "someStr": "hello",
'someBool': True, "someBool": True,
'someDefaultInt': 0, "someDefaultInt": 0,
'someDefaultDouble': 0.0, "someDefaultDouble": 0.0,
'someDefaultStr': '', "someDefaultStr": "",
'someDefaultBool': False "someDefaultBool": False,
} }
# Nested messages # Nested messages
@ -257,15 +256,10 @@ def test_to_dict_default_values():
some_double: float = betterproto.double_field(2) some_double: float = betterproto.double_field(2)
some_message: TestChildMessage = betterproto.message_field(3) some_message: TestChildMessage = betterproto.message_field(3)
test = TestParentMessage().from_dict({ test = TestParentMessage().from_dict({"someInt": 0, "someDouble": 1.2,})
'someInt': 0,
'someDouble': 1.2,
})
assert test.to_dict(include_default_values=True) == { assert test.to_dict(include_default_values=True) == {
'someInt': 0, "someInt": 0,
'someDouble': 1.2, "someDouble": 1.2,
'someMessage': { "someMessage": {"someOtherInt": 0},
'someOtherInt': 0
}
} }