lint

Author: parthea

proto/message.py

@@ -419,15 +419,26 @@ def to_json(
 
         # For backwards compatibility of this breaking change in protobuf 5.x which is specific to proto2
         # https://github.com/protocolbuffers/protobuf/commit/26995798757fbfef5cf6648610848e389db1fecf
-        if always_print_fields_with_no_presence is not None and including_default_value_fields is not None and always_print_fields_with_no_presence != including_default_value_fields:
-            raise ValueError("Arguments `always_print_fields_with_no_presence` and `including_default_value_fields` must match")
+        if (
+            always_print_fields_with_no_presence is not None
+            and including_default_value_fields is not None
+            and always_print_fields_with_no_presence != including_default_value_fields
+        ):
+            raise ValueError(
+                "Arguments `always_print_fields_with_no_presence` and `including_default_value_fields` must match"
+            )
 
         # By default, fields with no presense will be included in the results
         # when both `always_print_fields_with_no_presence` and `including_default_value_fields` are not set
-        if always_print_fields_with_no_presence is None and including_default_value_fields is None:
+        if (
+            always_print_fields_with_no_presence is None
+            and including_default_value_fields is None
+        ):
             print_fields = True
         else:
-            print_fields = always_print_fields_with_no_presence or including_default_value_fields
+            print_fields = (
+                always_print_fields_with_no_presence or including_default_value_fields
+            )
 
         if PROTOBUF_VERSION[0] in ("3", "4"):
             return MessageToJson(
@@ -513,15 +524,26 @@ def to_dict(
 
         # For backwards compatibility of this breaking change in protobuf 5.x which is specific to proto2
         # https://github.com/protocolbuffers/protobuf/commit/26995798757fbfef5cf6648610848e389db1fecf
-        if always_print_fields_with_no_presence is not None and including_default_value_fields is not None and always_print_fields_with_no_presence != including_default_value_fields:
-            raise ValueError("Arguments `always_print_fields_with_no_presence` and `including_default_value_fields` must match")
+        if (
+            always_print_fields_with_no_presence is not None
+            and including_default_value_fields is not None
+            and always_print_fields_with_no_presence != including_default_value_fields
+        ):
+            raise ValueError(
+                "Arguments `always_print_fields_with_no_presence` and `including_default_value_fields` must match"
+            )
 
         # By default, fields with no presense will be included in the results
         # when both `always_print_fields_with_no_presence` and `including_default_value_fields` are not set
-        if always_print_fields_with_no_presence is None and including_default_value_fields is None:
+        if (
+            always_print_fields_with_no_presence is None
+            and including_default_value_fields is None
+        ):
             print_fields = True
         else:
-            print_fields = always_print_fields_with_no_presence or including_default_value_fields
+            print_fields = (
+                always_print_fields_with_no_presence or including_default_value_fields
+            )
 
         if PROTOBUF_VERSION[0] in ("3", "4"):
             return MessageToDict(

tests/conftest.py

@@ -41,9 +41,11 @@ def pytest_runtest_setup(item):
 
         item._mocks.append(
             mock.patch(
-                "google._upb._message.default_pool"
-                if has_upb()
-                else "google.protobuf.pyext._message.default_pool",
+                (
+                    "google._upb._message.default_pool"
+                    if has_upb()
+                    else "google.protobuf.pyext._message.default_pool"
+                ),
                 pool,
             )
         )

tests/test_fields_mitigate_collision.py

@@ -15,6 +15,7 @@
 import proto
 import pytest
 
+
 # Underscores may be appended to field names
 # that collide with python or proto-plus keywords.
 # In case a key only exists with a `_` suffix, coerce the key