protobuf 5.29.0rc3__py3-none-any.whl → 6.33.3__py3-none-any.whl

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()
 
@@ -85,9 +86,9 @@ class DescriptorPool(object):
 
   if _USE_C_DESCRIPTORS:
 
-   def __new__(cls, descriptor_db=None):
-     # pylint: disable=protected-access
-     return descriptor._message.DescriptorPool(descriptor_db)
+     def __new__(cls, descriptor_db=None):
+       # pylint: disable=protected-access
+       return descriptor._message.DescriptorPool(descriptor_db)
 
   def __init__(
       self, descriptor_db=None, use_deprecated_legacy_json_field_conflicts=False
@@ -580,11 +581,21 @@ class DescriptorPool(object):
     if self._descriptor_db and hasattr(
         self._descriptor_db, 'FindAllExtensionNumbers'):
       full_name = message_descriptor.full_name
-      all_numbers = self._descriptor_db.FindAllExtensionNumbers(full_name)
-      for number in all_numbers:
-        if number in self._extensions_by_number[message_descriptor]:
-          continue
-        self._TryLoadExtensionFromDB(message_descriptor, number)
+      try:
+        all_numbers = self._descriptor_db.FindAllExtensionNumbers(full_name)
+      except:
+        pass
+      else:
+        if isinstance(all_numbers, list):
+          for number in all_numbers:
+            if number in self._extensions_by_number[message_descriptor]:
+              continue
+            self._TryLoadExtensionFromDB(message_descriptor, number)
+        else:
+          warnings.warn(
+              'FindAllExtensionNumbers() on fall back DB must return a list,'
+              ' not {0}'.format(type(all_numbers))
+          )
 
     return list(self._extensions_by_number[message_descriptor].values())
 
@@ -603,8 +614,13 @@ class DescriptorPool(object):
       return
 
     full_name = message_descriptor.full_name
-    file_proto = self._descriptor_db.FindFileContainingExtension(
-        full_name, number)
+    file_proto = None
+    try:
+      file_proto = self._descriptor_db.FindFileContainingExtension(
+          full_name, number
+      )
+    except:
+      return
 
     if file_proto is None:
       return
@@ -668,7 +684,6 @@ class DescriptorPool(object):
     if not isinstance(defaults, descriptor_pb2.FeatureSetDefaults):
       raise TypeError('SetFeatureSetDefaults called with invalid type')
 
-
     if defaults.minimum_edition > defaults.maximum_edition:
       raise ValueError(
           'Invalid edition range %s to %s'
@@ -723,7 +738,10 @@ class DescriptorPool(object):
               ),
           )
       )
-    if edition > self._edition_defaults.maximum_edition:
+    if (
+        edition > self._edition_defaults.maximum_edition
+        and edition != descriptor_pb2.EDITION_UNSTABLE
+    ):
       raise TypeError(
           'Edition %s is later than the maximum supported edition %s!'
           % (

google/protobuf/duration_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: google/protobuf/duration.proto
-# Protobuf Python Version: 5.29.0-rc3
+# Protobuf Python Version: 6.33.3
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,10 +11,10 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    5,
-    29,
-    0,
-    '-rc3',
+    6,
+    33,
+    3,
+    '',
     'google/protobuf/duration.proto'
 )
 # @@protoc_insertion_point(imports)

google/protobuf/empty_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: google/protobuf/empty.proto
-# Protobuf Python Version: 5.29.0-rc3
+# Protobuf Python Version: 6.33.3
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,10 +11,10 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    5,
-    29,
-    0,
-    '-rc3',
+    6,
+    33,
+    3,
+    '',
     'google/protobuf/empty.proto'
 )
 # @@protoc_insertion_point(imports)

google/protobuf/field_mask_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: google/protobuf/field_mask.proto
-# Protobuf Python Version: 5.29.0-rc3
+# Protobuf Python Version: 6.33.3
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,10 +11,10 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    5,
-    29,
-    0,
-    '-rc3',
+    6,
+    33,
+    3,
+    '',
     'google/protobuf/field_mask.proto'
 )
 # @@protoc_insertion_point(imports)

google/protobuf/internal/api_implementation.py

@@ -131,12 +131,6 @@ def Type():
   return _implementation_type
 
 
-# See comment on 'Type' above.
-# TODO: Remove the API, it returns a constant. b/228102101
-def Version():
-  return 2
-
-
 # For internal use only
 def IsPythonDefaultSerializationDeterministic():
   return _python_deterministic_proto_serialization

google/protobuf/internal/builder.py

@@ -54,12 +54,13 @@ def BuildTopDescriptorsAndMessages(file_des, module_name, module):
     module: Generated _pb2 module
   """
 
-  def BuildMessage(msg_des):
+  def BuildMessage(msg_des, prefix):
     create_dict = {}
     for (name, nested_msg) in msg_des.nested_types_by_name.items():
-      create_dict[name] = BuildMessage(nested_msg)
+      create_dict[name] = BuildMessage(nested_msg, prefix + msg_des.name + '.')
     create_dict['DESCRIPTOR'] = msg_des
     create_dict['__module__'] = module_name
+    create_dict['__qualname__'] = prefix + msg_des.name
     message_class = _reflection.GeneratedProtocolMessageType(
         msg_des.name, (_message.Message,), create_dict)
     _sym_db.RegisterMessage(message_class)
@@ -83,7 +84,7 @@ def BuildTopDescriptorsAndMessages(file_des, module_name, module):
 
   # Build messages.
   for (name, msg_des) in file_des.message_types_by_name.items():
-    module[name] = BuildMessage(msg_des)
+    module[name] = BuildMessage(msg_des, '')
 
 
 def AddHelpersToExtensions(file_des):

google/protobuf/internal/containers.py

@@ -412,6 +412,13 @@ class ScalarMap(MutableMapping[_K, _V]):
   def __repr__(self) -> str:
     return repr(self._values)
 
+  def setdefault(self, key: _K, value: Optional[_V] = None) -> _V:
+    if value == None:
+      raise ValueError('The value for scalar map setdefault must be set.')
+    if key not in self._values:
+      self.__setitem__(key, value)
+    return self[key]
+
   def MergeFrom(self, other: 'ScalarMap[_K, _V]') -> None:
     self._values.update(other._values)
     self._message_listener.Modified()
@@ -526,6 +533,12 @@ class MessageMap(MutableMapping[_K, _V]):
   def __repr__(self) -> str:
     return repr(self._values)
 
+  def setdefault(self, key: _K, value: Optional[_V] = None) -> _V:
+    raise NotImplementedError(
+        'Set message map value directly is not supported, call'
+        ' my_map[key].foo = 5'
+    )
+
   def MergeFrom(self, other: 'MessageMap[_K, _V]') -> None:
     # pylint: disable=protected-access
     for key in other._values: