moved _to_map outside class

Author: daniel-sanche

proto/message.py

@@ -457,46 +457,6 @@ def _normalize_print_fields_without_presence(
             or including_default_value_fields
         )
 
-    @staticmethod
-    def _to_map(
-        cls,
-        map_fn,
-        instance,
-        *,
-        including_default_value_fields=None,
-        float_precision=None,
-        always_print_fields_with_no_presence=None,
-        **kwargs,
-    ):
-        """
-        Helper for logic for to_dict and to_json
-        """
-        print_fields = cls._normalize_print_fields_without_presence(
-            always_print_fields_with_no_presence, including_default_value_fields
-        )
-
-        # The `including_default_value_fields` argument was removed from protobuf 5.x
-        # and replaced with `always_print_fields_with_no_presence` which very similar but has
-        # handles optional fields consistently by not affecting them.
-        # The old flag accidentally had inconsistent behavior between proto2
-        # optional and proto3 optional fields.
-        if PROTOBUF_VERSION[0] in ("3", "4"):
-            kwargs["including_default_value_fields"] = print_fields
-        else:
-            kwargs["always_print_fields_with_no_presence"] = print_fields
-
-        if float_precision:
-            # float_precision removed in protobuf 7
-            if int(PROTOBUF_VERSION[0]) < 7:
-                kwargs["float_precision"] = float_precision
-            else:
-                warnings.warn(
-                    "The argument `float_precision` has been removed from Protobuf 7.x.",
-                    DeprecationWarning,
-                )
-
-        return map_fn(cls.pb(instance), **kwargs)
-
     def to_json(
         cls,
         instance,
@@ -541,7 +501,7 @@ def to_json(
         Returns:
             str: The json string representation of the protocol buffer.
         """
-        return cls._to_map(map_fn=MessageToJson, **locals())
+        return _message_to_map(map_fn=MessageToJson, **locals())
 
     def from_json(cls, payload, *, ignore_unknown_fields=False) -> "Message":
         """Given a json string representing an instance,
@@ -599,7 +559,7 @@ def to_dict(
                   Messages and map fields are represented as dicts,
                   repeated fields are represented as lists.
         """
-        return cls._to_map(map_fn=MessageToDict, **locals())
+        return _message_to_map(map_fn=MessageToDict, **locals())
 
     def copy_from(cls, instance, other):
         """Equivalent for protobuf.Message.CopyFrom
@@ -952,4 +912,44 @@ def pb(self) -> Type[message.Message]:
         return self._pb
 
 
+def _message_to_map(
+    cls,
+    map_fn,
+    instance,
+    *,
+    including_default_value_fields=None,
+    float_precision=None,
+    always_print_fields_with_no_presence=None,
+    **kwargs,
+):
+    """
+    Helper for logic for Message.to_dict and Message.to_json
+    """
+    print_fields = cls._normalize_print_fields_without_presence(
+        always_print_fields_with_no_presence, including_default_value_fields
+    )
+
+    # The `including_default_value_fields` argument was removed from protobuf 5.x
+    # and replaced with `always_print_fields_with_no_presence` which very similar but has
+    # handles optional fields consistently by not affecting them.
+    # The old flag accidentally had inconsistent behavior between proto2
+    # optional and proto3 optional fields.
+    if PROTOBUF_VERSION[0] in ("3", "4"):
+        kwargs["including_default_value_fields"] = print_fields
+    else:
+        kwargs["always_print_fields_with_no_presence"] = print_fields
+
+    if float_precision:
+        # float_precision removed in protobuf 7
+        if int(PROTOBUF_VERSION[0]) < 7:
+            kwargs["float_precision"] = float_precision
+        else:
+            warnings.warn(
+                "The argument `float_precision` has been removed from Protobuf 7.x.",
+                DeprecationWarning,
+            )
+
+    return map_fn(cls.pb(instance), **kwargs)
+
+
 __all__ = ("Message",)