Remove calls to Label within Protobuf Python.

PiperOrigin-RevId: 756880197

Author: protobuf-github-bot

python/google/protobuf/descriptor_pool.py

@@ -75,7 +75,8 @@ def _IsMessageSetExtension(field):
           field.containing_type.has_options and
           field.containing_type.GetOptions().message_set_wire_format and
           field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-          field.label == descriptor.FieldDescriptor.LABEL_OPTIONAL)
+          not field.is_required and
+          not field.is_repeated)
 
 _edition_defaults_lock = threading.Lock()
 

python/google/protobuf/internal/descriptor_pool_test.py

@@ -329,7 +329,7 @@ def testFindFieldByName(self):
     field = self.pool.FindFieldByName(
         'google.protobuf.python.internal.Factory1Message.list_value')
     self.assertEqual(field.name, 'list_value')
-    self.assertEqual(field.label, field.LABEL_REPEATED)
+    self.assertTrue(field.is_repeated)
     self.assertFalse(field.has_options)
 
     with self.assertRaises(KeyError):

python/google/protobuf/internal/extension_dict.py

@@ -61,7 +61,7 @@ def __getitem__(self, extension_handle):
     if result is not None:
       return result
 
-    if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
+    if extension_handle.is_repeated:
       result = extension_handle._default_constructor(self._extended_message)
     elif extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
       message_type = extension_handle.message_type
@@ -129,7 +129,7 @@ def __setitem__(self, extension_handle, value):
 
     _VerifyExtensionHandle(self._extended_message, extension_handle)
 
-    if (extension_handle.label == FieldDescriptor.LABEL_REPEATED or
+    if (extension_handle.is_repeated or
         extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE):
       raise TypeError(
           'Cannot assign to extension "%s" because it is a repeated or '
@@ -183,7 +183,7 @@ def __contains__(self, extension_handle):
     if extension_handle not in self._extended_message._fields:
       return False
 
-    if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
+    if extension_handle.is_repeated:
       return bool(self._extended_message._fields.get(extension_handle))
 
     if extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:

python/google/protobuf/internal/field_mask.py

@@ -100,7 +100,7 @@ def _IsValidPath(message_descriptor, path):
   for name in parts:
     field = message_descriptor.fields_by_name.get(name)
     if (field is None or
-        field.label == FieldDescriptor.LABEL_REPEATED or
+        field.is_repeated or
         field.type != FieldDescriptor.TYPE_MESSAGE):
       return False
     message_descriptor = field.message_type
@@ -271,7 +271,7 @@ def _MergeMessage(
           name, source_descriptor.full_name))
     if child:
       # Sub-paths are only allowed for singular message fields.
-      if (field.label == FieldDescriptor.LABEL_REPEATED or
+      if (field.is_repeated or
           field.cpp_type != FieldDescriptor.CPPTYPE_MESSAGE):
         raise ValueError('Error: Field {0} in message {1} is not a singular '
                          'message field and cannot have sub-fields.'.format(
@@ -281,7 +281,7 @@ def _MergeMessage(
             child, getattr(source, name), getattr(destination, name),
             replace_message, replace_repeated)
       continue
-    if field.label == FieldDescriptor.LABEL_REPEATED:
+    if field.is_repeated:
       if replace_repeated:
         destination.ClearField(_StrConvert(name))
       repeated_source = getattr(source, name)

python/google/protobuf/internal/field_mask_test.py

@@ -193,7 +193,7 @@ def testMergeMessageWithoutMapFields(self):
       mask.MergeMessage(src, dst)
       # The expected result message.
       msg = unittest_pb2.TestAllTypes()
-      if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+      if field.is_repeated:
         repeated_src = getattr(src, field_name)
         repeated_msg = getattr(msg, field_name)
         if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:

python/google/protobuf/internal/message_test.py

@@ -1905,7 +1905,7 @@ def testProto3Optional(self):
       if field.name.startswith('optional_'):
         self.assertTrue(field.has_presence)
     for field in unittest_pb2.TestAllTypes.DESCRIPTOR.fields:
-      if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+      if field.is_repeated:
         self.assertFalse(field.has_presence)
       else:
         self.assertTrue(field.has_presence)

python/google/protobuf/internal/python_message.py

@@ -256,7 +256,8 @@ def _IsMessageSetExtension(field):
           field.containing_type.has_options and
           field.containing_type.GetOptions().message_set_wire_format and
           field.type == _FieldDescriptor.TYPE_MESSAGE and
-          field.label == _FieldDescriptor.LABEL_OPTIONAL)
+          not field.is_required and
+          not field.is_repeated)
 
 
 def _IsMapField(field):
@@ -1260,7 +1261,7 @@ def _AddIsInitializedMethod(message_descriptor, cls):
   protocol message class."""
 
   required_fields = [field for field in message_descriptor.fields
-                           if field.label == _FieldDescriptor.LABEL_REQUIRED]
+                           if field.is_required]
 
   def IsInitialized(self, errors=None):
     """Checks if all required fields of a message are set.

python/google/protobuf/internal/reflection_test.py

@@ -3286,9 +3286,8 @@ def testPackedOptions(self):
     proto.packed_int32.append(1)
     proto.packed_double.append(3.0)
     for field_descriptor, _ in proto.ListFields():
-      self.assertEqual(True, field_descriptor.is_packed)
-      self.assertEqual(descriptor.FieldDescriptor.LABEL_REPEATED,
-                       field_descriptor.label)
+      self.assertTrue(field_descriptor.is_packed)
+      self.assertTrue(field_descriptor.is_repeated)
 
 
 @testing_refleaks.TestCase

python/google/protobuf/internal/unknown_fields_test.py

@@ -183,7 +183,7 @@ def CheckUnknownField(self, name, unknown_field_set, expected_value):
           continue
         if expected_type == wire_format.WIRETYPE_LENGTH_DELIMITED:
           self.assertIn(type(unknown_field.data), (str, bytes))
-        if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+        if field_descriptor.is_repeated:
           self.assertIn(unknown_field.data, expected_value)
         else:
           self.assertEqual(expected_value, unknown_field.data)
@@ -362,11 +362,11 @@ def CheckUnknownField(self, name, expected_value):
     for field in unknown_field_set:
       if field.field_number == field_descriptor.number:
         count += 1
-        if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+        if field_descriptor.is_repeated:
           self.assertIn(field.data, expected_value)
         else:
           self.assertEqual(expected_value, field.data)
-    if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+    if field_descriptor.is_repeated:
       self.assertEqual(count, len(expected_value))
     else:
       self.assertEqual(count, 1)

python/google/protobuf/json_format.py

@@ -236,7 +236,7 @@ def _RegularMessageToJsonObject(self, message, js):
               recorded_key = str(key)
             js_map[recorded_key] = self._FieldToJsonObject(v_field, value[key])
           js[name] = js_map
-        elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+        elif field.is_repeated:
           # Convert a repeated field.
           js[name] = [self._FieldToJsonObject(field, k) for k in value]
         elif field.is_extension:
@@ -266,7 +266,7 @@ def _RegularMessageToJsonObject(self, message, js):
             continue
           if _IsMapEntry(field):
             js[name] = {}
-          elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+          elif field.is_repeated:
             js[name] = []
           else:
             js[name] = self._FieldToJsonObject(field, field.default_value)
@@ -636,7 +636,7 @@ def _ConvertFieldValuePair(self, js, message, path):
           self._ConvertMapFieldValue(
               value, message, field, '{0}.{1}'.format(path, name)
           )
-        elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+        elif field.is_repeated:
           message.ClearField(field.name)
           if not isinstance(value, _LIST_LIKE):
             raise ParseError(

python/google/protobuf/text_format.py

@@ -477,7 +477,7 @@ def PrintMessage(self, message):
           # TODO: refactor and optimize if this becomes an issue.
           entry_submsg = value.GetEntryClass()(key=key, value=value[key])
           self.PrintField(field, entry_submsg)
-      elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+      elif field.is_repeated:
         if (self.use_short_repeated_primitives
             and field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_MESSAGE
             and field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_STRING):
@@ -557,7 +557,8 @@ def _PrintFieldName(self, field):
         out.write('[')
         if (field.containing_type.GetOptions().message_set_wire_format and
             field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-            field.label == descriptor.FieldDescriptor.LABEL_OPTIONAL):
+            not field.is_required and
+            not field.is_repeated):
           out.write(field.message_type.full_name)
         else:
           out.write(field.full_name)
@@ -998,7 +999,7 @@ def _MergeField(self, tokenizer, message):
                                  field.full_name)
         merger = self._MergeScalarField
 
-      if (field.label == descriptor.FieldDescriptor.LABEL_REPEATED and
+      if (field.is_repeated and
           tokenizer.TryConsume('[')):
         # Short repeated format, e.g. "foo: [1, 2, 3]"
         if not tokenizer.TryConsume(']'):
@@ -1061,7 +1062,7 @@ def _MergeMessageField(self, tokenizer, message, field):
       tokenizer.Consume('{')
       end_token = '}'
 
-    if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+    if field.is_repeated:
       if field.is_extension:
         sub_message = message.Extensions[field].add()
       elif is_map_entry:
@@ -1143,7 +1144,7 @@ def _MergeScalarField(self, tokenizer, message, field):
     else:
       raise RuntimeError('Unknown field type %d' % field.type)
 
-    if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
+    if field.is_repeated:
       if field.is_extension:
         message.Extensions[field].append(value)
       else: