pub/python-betterproto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update black

Browse Source
This commit is contained in:
James
2020-08-29 16:15:59 +01:00
committed by GitHub
parent 9ef5503728
commit 16d554db75
9 changed files with 168 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/betterproto/plugin/models.py
View File

@@ -130,7 +130,7 @@ def get_comment(proto_file, path: List[int], indent: int = 4) -> str:
# print(list(sci.path), path, file=sys.stderr)
if list(sci.path) == path and sci.leading_comments:
lines = textwrap.wrap(
sci.leading_comments.strip().replace("\n", ""), width=79 - indent,
sci.leading_comments.strip().replace("\n", ""), width=79 - indent
)
if path[-2] == 2 and path[-4] != 6:
@@ -188,7 +188,7 @@ class ProtoContentBase:
for this object.
"""
return get_comment(
proto_file=self.proto_file, path=self.path, indent=self.comment_indent,
proto_file=self.proto_file, path=self.path, indent=self.comment_indent
)
@@ -263,8 +263,7 @@ class OutputTemplate:
@dataclass
class MessageCompiler(ProtoContentBase):
"""Representation of a protobuf message.
"""
"""Representation of a protobuf message."""
parent: Union["MessageCompiler", OutputTemplate] = PLACEHOLDER
proto_obj: DescriptorProto = PLACEHOLDER
@@ -308,8 +307,7 @@ class MessageCompiler(ProtoContentBase):
def is_map(
proto_field_obj: FieldDescriptorProto, parent_message: DescriptorProto
) -> bool:
"""True if proto_field_obj is a map, otherwise False.
"""
"""True if proto_field_obj is a map, otherwise False."""
if proto_field_obj.type == FieldDescriptorProto.TYPE_MESSAGE:
# This might be a map...
message_type = proto_field_obj.type_name.split(".").pop().lower()
@@ -323,8 +321,7 @@ def is_map(
def is_oneof(proto_field_obj: FieldDescriptorProto) -> bool:
"""True if proto_field_obj is a OneOf, otherwise False.
"""
"""True if proto_field_obj is a OneOf, otherwise False."""
if proto_field_obj.HasField("oneof_index"):
return True
return False
@@ -375,8 +372,7 @@ class FieldCompiler(MessageCompiler):
@property
def field_wraps(self) -> Union[str, None]:
"""Returns betterproto wrapped field type or None.
"""
"""Returns betterproto wrapped field type or None."""
match_wrapper = re.match(
r"\.google\.protobuf\.(.+)Value", self.proto_obj.type_name
)
@@ -409,8 +405,7 @@ class FieldCompiler(MessageCompiler):
@property
def default_value_string(self) -> Union[Text, None, float, int]:
"""Python representation of the default proto value.
"""
"""Python representation of the default proto value."""
if self.repeated:
return "[]"
if self.py_type == "int":
@@ -499,10 +494,10 @@ class MapEntryCompiler(FieldCompiler):
if nested.options.map_entry:
# Get Python types
self.py_k_type = FieldCompiler(
parent=self, proto_obj=nested.field[0], # key
parent=self, proto_obj=nested.field[0] # key
).py_type
self.py_v_type = FieldCompiler(
parent=self, proto_obj=nested.field[1], # value
parent=self, proto_obj=nested.field[1] # value
).py_type
# Get proto types
self.proto_k_type = self.proto_obj.Type.Name(nested.field[0].type)

4
src/betterproto/plugin/parser.py
View File

@@ -166,9 +166,9 @@ def read_protobuf_service(
service: ServiceDescriptorProto, index: int, output_package: OutputTemplate
) -> None:
service_data = ServiceCompiler(
parent=output_package, proto_obj=service, path=[6, index],
parent=output_package, proto_obj=service, path=[6, index]
)
for j, method in enumerate(service.method):
ServiceMethodCompiler(
parent=service_data, proto_obj=method, path=[6, index, 2, j],
parent=service_data, proto_obj=method, path=[6, index, 2, j]
)