Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/python/google/protobuf/internal/containers.py

 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # https://developers.google.com/protocol-buffers/
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 418 matching lines @@
       raise TypeError('Can only compare repeated composite fields against '
                       'other repeated composite fields.')
     return self._values == other._values
 
 
 class ScalarMap(MutableMapping):
 
   """Simple, type-checked, dict-like container for holding repeated scalars."""
 
   # Disallows assignment to other attributes.
-  __slots__ = ['_key_checker', '_value_checker', '_values', '_message_listener',
-               '_entry_descriptor']
+  __slots__ = ['_key_checker', '_value_checker', '_values', '_message_listener']
 
-  def __init__(self, message_listener, key_checker, value_checker,
-               entry_descriptor):
+  def __init__(self, message_listener, key_checker, value_checker):
     """
     Args:
       message_listener: A MessageListener implementation.
         The ScalarMap will call this object's Modified() method when it
         is modified.
       key_checker: A type_checkers.ValueChecker instance to run on keys
         inserted into this container.
       value_checker: A type_checkers.ValueChecker instance to run on values
         inserted into this container.
-      entry_descriptor: The MessageDescriptor of a map entry: key and value.
     """
     self._message_listener = message_listener
     self._key_checker = key_checker
     self._value_checker = value_checker
-    self._entry_descriptor = entry_descriptor
     self._values = {}
 
   def __getitem__(self, key):
     try:
       return self._values[key]
     except KeyError:
       key = self._key_checker.CheckValue(key)
       val = self._value_checker.DefaultValue()
       self._values[key] = val
       return val
@@ skipping 41 matching lines @@
     # self._values is to ensure that its size changes.
     original = self._values
     self._values = original.copy()
     original[None] = None
 
   # This is defined in the abstract base, but we can do it much more cheaply.
   def clear(self):
     self._values.clear()
     self._message_listener.Modified()
 
-  def GetEntryClass(self):
-    return self._entry_descriptor._concrete_class
-
 
 class MessageMap(MutableMapping):
 
   """Simple, type-checked, dict-like container for with submessage values."""
 
   # Disallows assignment to other attributes.
   __slots__ = ['_key_checker', '_values', '_message_listener',
-               '_message_descriptor', '_entry_descriptor']
+               '_message_descriptor']
 
-  def __init__(self, message_listener, message_descriptor, key_checker,
-               entry_descriptor):
+  def __init__(self, message_listener, message_descriptor, key_checker):
     """
     Args:
       message_listener: A MessageListener implementation.
         The ScalarMap will call this object's Modified() method when it
         is modified.
       key_checker: A type_checkers.ValueChecker instance to run on keys
         inserted into this container.
       value_checker: A type_checkers.ValueChecker instance to run on values
         inserted into this container.
-      entry_descriptor: The MessageDescriptor of a map entry: key and value.
     """
     self._message_listener = message_listener
     self._message_descriptor = message_descriptor
     self._key_checker = key_checker
-    self._entry_descriptor = entry_descriptor
     self._values = {}
 
   def __getitem__(self, key):
     try:
       return self._values[key]
     except KeyError:
       key = self._key_checker.CheckValue(key)
       new_element = self._message_descriptor._concrete_class()
       new_element._SetListener(self._message_listener)
       self._values[key] = new_element
@@ skipping 38 matching lines @@
     return len(self._values)
 
   def __iter__(self):
     return iter(self._values)
 
   def __repr__(self):
     return repr(self._values)
 
   def MergeFrom(self, other):
     for key in other:
-      # According to documentation: "When parsing from the wire or when merging,
-      # if there are duplicate map keys the last key seen is used".
-      if key in self:
-        del self[key]
-      self[key].CopyFrom(other[key])
+      self[key].MergeFrom(other[key])
     # self._message_listener.Modified() not required here, because
     # mutations to submessages already propagate.
 
   def InvalidateIterators(self):
     # It appears that the only way to reliably invalidate iterators to
     # self._values is to ensure that its size changes.
     original = self._values
     self._values = original.copy()
     original[None] = None
 
   # This is defined in the abstract base, but we can do it much more cheaply.
   def clear(self):
     self._values.clear()
     self._message_listener.Modified()
-
-  def GetEntryClass(self):
-    return self._entry_descriptor._concrete_class