Update black

Author: Gobot1234

poetry.lock

@@ -14,14 +14,14 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.6"
 backports-datetime-fromisoformat = { version = "^1.0.0", python = "<3.7" }
-black = { version = "^19.10b0", optional = true }
+black = { version = "^20.8b1", optional = true }
 dataclasses = { version = "^0.7", python = ">=3.6, <3.7" }
 grpclib = "^0.3.1"
 jinja2 = { version = "^2.11.2", optional = true }
 protobuf = { version = "^3.12.2", optional = true }
 
 [tool.poetry.dev-dependencies]
-black = "^19.10b0"
+black = "^20.8b1"
 bpython = "^0.19"
 grpcio-tools = "^1.30.0"
 jinja2 = "^2.11.2"

pyproject.toml

@@ -549,7 +549,7 @@ def __setattr__(self, attr: str, value: Any) -> None:
                         self._group_current[group] = field.name
                     else:
                         super().__setattr__(
-                            field.name, self._get_field_default(field.name),
+                            field.name, self._get_field_default(field.name)
                         )
 
         super().__setattr__(attr, value)
@@ -857,7 +857,7 @@ def to_dict(
                         field_name=field_name, meta=meta
                     )
                 ):
-                    output[cased_name] = value.to_dict(casing, include_default_values,)
+                    output[cased_name] = value.to_dict(casing, include_default_values)
             elif meta.proto_type == "map":
                 for k in value:
                     if hasattr(value[k], "to_dict"):

src/betterproto/__init__.py

@@ -36,7 +36,7 @@ def parse_source_type_name(field_type_name):
 
 
 def get_type_reference(
-    package: str, imports: set, source_type: str, unwrap: bool = True,
+    package: str, imports: set, source_type: str, unwrap: bool = True
 ) -> str:
     """
     Return a Python type name for a proto type reference. Adds the import if

src/betterproto/compile/importing.py

@@ -80,9 +80,7 @@ class AsyncChannel(AsyncIterable[T]):
         or immediately if no source is provided.
     """
 
-    def __init__(
-        self, *, buffer_limit: int = 0, close: bool = False,
-    ):
+    def __init__(self, *, buffer_limit: int = 0, close: bool = False):
         self._queue: asyncio.Queue[Union[T, object]] = asyncio.Queue(buffer_limit)
         self._closed = False
         self._waiting_receivers: int = 0

src/betterproto/grpc/util/async_channel.py

@@ -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 @@ def comment(self) -> str:
         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 @@ def python_module_imports(self) -> Set[str]:
 
 @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 @@ def deprecated_fields(self) -> Iterator[str]:
 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 @@ def betterproto_field_args(self) -> List[str]:
 
     @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 @@ def field_type(self) -> str:
 
     @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 @@ def __post_init__(self):
                 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)

src/betterproto/plugin/models.py

@@ -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]
         )

src/betterproto/plugin/parser.py

@@ -106,7 +106,7 @@ async def test_service_call_with_upfront_request_params():
     deadline = grpclib.metadata.Deadline.from_timeout(22)
     metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata))]
     ) as channel:
         await _test_client(
             ThingServiceClient(channel, deadline=deadline, metadata=metadata)
@@ -117,7 +117,7 @@ async def test_service_call_with_upfront_request_params():
     deadline = grpclib.metadata.Deadline.from_timeout(timeout)
     metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata))]
     ) as channel:
         await _test_client(
             ThingServiceClient(channel, timeout=timeout, metadata=metadata)
@@ -134,7 +134,7 @@ async def test_service_call_lower_level_with_overrides():
     kwarg_deadline = grpclib.metadata.Deadline.from_timeout(28)
     kwarg_metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata))]
     ) as channel:
         client = ThingServiceClient(channel, deadline=deadline, metadata=metadata)
         response = await client._unary_unary(

tests/grpc/test_grpclib_client.py

@@ -42,7 +42,7 @@ async def protoc(
         *[p.as_posix() for p in path.glob("*.proto")],
     ]
     proc = await asyncio.create_subprocess_exec(
-        *command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE,
+        *command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
     )
     stdout, stderr = await proc.communicate()
     return stdout, stderr, proc.returncode