Pull new version of protobuf sources.

third_party/protobuf/python/google/protobuf/pyext/python.proto

Index: third_party/protobuf/python/google/protobuf/pyext/python.proto
diff --git a/third_party/protobuf/python/google/protobuf/internal/more_extensions.proto b/third_party/protobuf/python/google/protobuf/pyext/python.proto
similarity index 61%
copy from third_party/protobuf/python/google/protobuf/internal/more_extensions.proto
copy to third_party/protobuf/python/google/protobuf/pyext/python.proto
index e2d97010450d32f2d1dd7b3ec0d2d05bf93435cb..cce645d71ad9d5e4acffb7ad8ebc8d2febc5f5f2 100644
--- a/third_party/protobuf/python/google/protobuf/internal/more_extensions.proto
+++ b/third_party/protobuf/python/google/protobuf/pyext/python.proto
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// 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
@@ -28,31 +28,41 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: robinson@google.com (Will Robinson)
-
+// Author: tibell@google.com (Johan Tibell)
+//
+// These message definitions are used to exercises known corner cases
+// in the C++ implementation of the Python API.
 
-package google.protobuf.internal;
+syntax = "proto2";
 
+package google.protobuf.python.internal;
 
-message TopLevelMessage {
-  optional ExtendedMessage submessage = 1;
-}
+// Protos optimized for SPEED use a strict superset of the generated code
+// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
+// tests for speed unless explicitly testing code size optimization.
+option optimize_for = SPEED;
 
+message TestAllTypes {
+  message NestedMessage {
+    optional int32 bb = 1;
+    optional ForeignMessage cc = 2;
+  }
 
-message ExtendedMessage {
-  extensions 1 to max;
+  repeated NestedMessage repeated_nested_message = 1;
+  optional NestedMessage optional_nested_message = 2;
+  optional int32 optional_int32 = 3;
 }
 
-
 message ForeignMessage {
-  optional int32 foreign_message_int = 1;
+  optional int32 c = 1;
+  repeated int32 d = 2;
 }
 
+message TestAllExtensions {
+  extensions 1 to max;
+}
 
-extend ExtendedMessage {
-  optional int32 optional_int_extension = 1;
-  optional ForeignMessage optional_message_extension = 2;
-
-  repeated int32 repeated_int_extension = 3;
-  repeated ForeignMessage repeated_message_extension = 4;
+extend TestAllExtensions {
+  optional TestAllTypes.NestedMessage optional_nested_message_extension = 1;
+  repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 2;
 }