Down-integrate from internal code base.

1 files changed, 5 insertions, 2 deletions

diff --git a/python/google/protobuf/internal/test_bad_identifiers.proto b/python/google/protobuf/internal/test_bad_identifiers.proto
index 9eb18cb0..29fa38a2 100644
--- a/python/google/protobuf/internal/test_bad_identifiers.proto
+++ b/python/google/protobuf/internal/test_bad_identifiers.proto
@@ -30,6 +30,7 @@
 
 // Author: kenton@google.com (Kenton Varda)
 
+syntax = "proto2";
 
 package protobuf_unittest;
 
@@ -39,13 +40,15 @@ message TestBadIdentifiers {
   extensions 100 to max;
 }
 
-// Make sure these reasonable extension names don't conflict with internal
-// variables.
 extend TestBadIdentifiers {
+  // Make sure these reasonable extension names don't conflict with internal
+  // variables.
   optional string message = 100 [default="foo"];
   optional string descriptor = 101 [default="bar"];
   optional string reflection = 102 [default="baz"];
   optional string service = 103 [default="qux"];
+  // And Python keywords.
+  optional string class = 104 [default="Foo"];
 }
 
 message AnotherMessage {}