Down-integrate from internal code base (C++ maps support).

1 files changed, 2 insertions, 4 deletions

diff --git a/python/google/protobuf/internal/test_bad_identifiers.proto b/python/google/protobuf/internal/test_bad_identifiers.proto
index 29fa38a2..c4860ea8 100644
--- a/python/google/protobuf/internal/test_bad_identifiers.proto
+++ b/python/google/protobuf/internal/test_bad_identifiers.proto
@@ -40,15 +40,13 @@ 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 {}