Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/python/google/protobuf/message_factory.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 85 matching lines @@
       files: The file names to extract messages from.
 
     Returns:
       A dictionary mapping proto names to the message classes. This will include
       any dependent messages as well as any messages defined in the same file as
       a specified message.
     """
     result = {}
     for file_name in files:
       file_desc = self.pool.FindFileByName(file_name)
-      for desc in file_desc.message_types_by_name.values():
-        result[desc.full_name] = self.GetPrototype(desc)
+      for name, msg in file_desc.message_types_by_name.items():
+        if file_desc.package:
+          full_name = '.'.join([file_desc.package, name])
+        else:
+          full_name = msg.name
+        result[full_name] = self.GetPrototype(
+            self.pool.FindMessageTypeByName(full_name))
 
       # While the extension FieldDescriptors are created by the descriptor pool,
       # the python classes created in the factory need them to be registered
       # explicitly, which is done below.
       #
       # The call to RegisterExtension will specifically check if the
       # extension was already registered on the object and either
       # ignore the registration if the original was the same, or raise
       # an error if they were different.
 
-      for extension in file_desc.extensions_by_name.values():
+      for name, extension in file_desc.extensions_by_name.items():
         if extension.containing_type.full_name not in self._classes:
           self.GetPrototype(extension.containing_type)
         extended_class = self._classes[extension.containing_type.full_name]
         extended_class.RegisterExtension(extension)
     return result
 
 
 _FACTORY = MessageFactory()
 
 
 def GetMessages(file_protos):
   """Builds a dictionary of all the messages available in a set of files.
 
   Args:
     file_protos: A sequence of file protos to build messages out of.
 
   Returns:
     A dictionary mapping proto names to the message classes. This will include
     any dependent messages as well as any messages defined in the same file as
     a specified message.
   """
   for file_proto in file_protos:
     _FACTORY.pool.Add(file_proto)
   return _FACTORY.GetMessages([file_proto.name for file_proto in file_protos])