Breaking change: Remove float_precision from python proto json_format

PiperOrigin-RevId: 826158770

Author: anandolee

python/google/protobuf/internal/json_format_test.py

@@ -1005,17 +1005,6 @@ def testParseDoubleToFloat(self):
 
   def testFloatPrecision(self):
     message = json_format_proto3_pb2.TestMessage()
-    message.float_value = 1.123456789
-    # Set to 8 valid digits.
-    text = '{\n  "floatValue": 1.1234568\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message, float_precision=8), text
-    )
-    # Set to 7 valid digits.
-    text = '{\n  "floatValue": 1.123457\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message, float_precision=7), text
-    )
 
     # Default float_precision will automatic print shortest float.
     message.float_value = 1.1000000011

python/google/protobuf/json_format.py

@@ -26,7 +26,6 @@
 import math
 from operator import methodcaller
 import re
-import warnings
 
 from google.protobuf import descriptor
 from google.protobuf import message_factory
@@ -85,7 +84,6 @@ def MessageToJson(
     sort_keys=False,
     use_integers_for_enums=False,
     descriptor_pool=None,
-    float_precision=None,
     ensure_ascii=True,
     always_print_fields_with_no_presence=False,
 ):
@@ -107,8 +105,6 @@ def MessageToJson(
     use_integers_for_enums: If true, print integers instead of enum names.
     descriptor_pool: A Descriptor Pool for resolving types. If None use the
       default.
-    float_precision: Deprecated. If set, use this to specify float field valid
-      digits.
     ensure_ascii: If True, strings with non-ASCII characters are escaped. If
       False, Unicode strings are returned unchanged.
 
@@ -119,7 +115,6 @@ def MessageToJson(
       preserving_proto_field_name,
       use_integers_for_enums,
       descriptor_pool,
-      float_precision,
       always_print_fields_with_no_presence,
   )
   return printer.ToJsonString(message, indent, sort_keys, ensure_ascii)
@@ -131,7 +126,6 @@ def MessageToDict(
     preserving_proto_field_name=False,
     use_integers_for_enums=False,
     descriptor_pool=None,
-    float_precision=None,
 ):
   """Converts protobuf message to a dictionary.
 
@@ -149,8 +143,6 @@ def MessageToDict(
     use_integers_for_enums: If true, print integers instead of enum names.
     descriptor_pool: A Descriptor Pool for resolving types. If None use the
       default.
-    float_precision: Deprecated. If set, use this to specify float field valid
-      digits.
 
   Returns:
     A dict representation of the protocol buffer message.
@@ -159,7 +151,6 @@ def MessageToDict(
       preserving_proto_field_name,
       use_integers_for_enums,
       descriptor_pool,
-      float_precision,
       always_print_fields_with_no_presence,
   )
   # pylint: disable=protected-access
@@ -182,7 +173,6 @@ def __init__(
       preserving_proto_field_name=False,
       use_integers_for_enums=False,
       descriptor_pool=None,
-      float_precision=None,
       always_print_fields_with_no_presence=False,
   ):
     self.always_print_fields_with_no_presence = (
@@ -191,15 +181,6 @@ def __init__(
     self.preserving_proto_field_name = preserving_proto_field_name
     self.use_integers_for_enums = use_integers_for_enums
     self.descriptor_pool = descriptor_pool
-    if float_precision:
-      warnings.warn(
-          'float_precision option is deprecated for json_format. '
-          'This will turn into error in 7.34.0, please remove it '
-          'before that.'
-      )
-      self.float_format = '.{}g'.format(float_precision)
-    else:
-      self.float_format = None
 
   def ToJsonString(self, message, indent, sort_keys, ensure_ascii):
     js = self._MessageToJsonObject(message)
@@ -322,8 +303,6 @@ def _FieldToJsonObject(self, field, value):
           return _INFINITY
       if math.isnan(value):
         return _NAN
-      if self.float_format:
-        return float(format(value, self.float_format))
       elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
         return type_checkers.ToShortestFloat(value)
 

python/google/protobuf/proto_json.py

@@ -19,7 +19,6 @@ def serialize(
     preserving_proto_field_name: bool=False,
     use_integers_for_enums: bool=False,
     descriptor_pool: Optional[DescriptorPool]=None,
-    float_precision: int=None,
 ) -> dict:
   """Converts protobuf message to a dictionary.
 
@@ -37,7 +36,6 @@ def serialize(
     use_integers_for_enums: If true, print integers instead of enum names.
     descriptor_pool: A Descriptor Pool for resolving types. If None use the
       default.
-    float_precision: If set, use this to specify float field valid digits.
 
   Returns:
     A dict representation of the protocol buffer message.
@@ -47,7 +45,6 @@ def serialize(
       always_print_fields_with_no_presence=always_print_fields_with_no_presence,
       preserving_proto_field_name=preserving_proto_field_name,
       use_integers_for_enums=use_integers_for_enums,
-      float_precision=float_precision,
   )
 
 def parse(