Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc

Index: third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc
diff --git a/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc b/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc
index 7b3b5fa3cd4a5ac34d3b2cfbaac555aac5a6a6ff..211ac70c096b2812522168dc61b3243589254036 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
+// http://code.google.com/p/protobuf/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -28,8 +28,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//#PY25 compatible generated code for GAE.
-// Copyright 2007 Google Inc. All Rights Reserved.
 // Author: robinson@google.com (Will Robinson)
 //
 // This module outputs pure-Python protocol message classes that will
@@ -44,15 +42,10 @@
 // performance-minded Python code leverage the fast C++ implementation
 // directly.
 
-#include <google/protobuf/stubs/hash.h>
 #include <limits>
 #include <map>
-#include <memory>
-#ifndef _SHARED_PTR_H
-#include <google/protobuf/stubs/shared_ptr.h>
-#endif
-#include <string>
 #include <utility>
+#include <string>
 #include <vector>
 
 #include <google/protobuf/compiler/python/python_generator.h>
@@ -92,37 +85,6 @@ string ModuleName(const string& filename) {
 }
 
 
-// Returns the alias we assign to the module of the given .proto filename
-// when importing. See testPackageInitializationImport in
-// google/protobuf/python/reflection_test.py
-// to see why we need the alias.
-string ModuleAlias(const string& filename) {
-  string module_name = ModuleName(filename);
-  // We can't have dots in the module name, so we replace each with _dot_.
-  // But that could lead to a collision between a.b and a_dot_b, so we also
-  // duplicate each underscore.
-  GlobalReplaceSubstring("_", "__", &module_name);
-  GlobalReplaceSubstring(".", "_dot_", &module_name);
-  return module_name;
-}
-
-
-// Returns an import statement of form "from X.Y.Z import T" for the given
-// .proto filename.
-string ModuleImportStatement(const string& filename) {
-  string module_name = ModuleName(filename);
-  int last_dot_pos = module_name.rfind('.');
-  if (last_dot_pos == string::npos) {
-    // NOTE(petya): this is not tested as it would require a protocol buffer
-    // outside of any package, and I don't think that is easily achievable.
-    return "import " + module_name;
-  } else {
-    return "from " + module_name.substr(0, last_dot_pos) + " import " +
-        module_name.substr(last_dot_pos + 1);
-  }
-}
-
-
 // Returns the name of all containing types for descriptor,
 // in order from outermost to innermost, followed by descriptor's
 // own name.  Each name is separated by |separator|.
@@ -166,7 +128,6 @@ void PrintTopBoilerplate(
   printer->Print(
       "# Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
       "# source: $filename$\n"
-      "\nimport sys\n_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))"  //##PY25
       "\n",
       "filename", file->name());
   if (HasTopLevelEnums(file)) {
@@ -177,8 +138,7 @@ void PrintTopBoilerplate(
       "from google.protobuf import descriptor as _descriptor\n"
       "from google.protobuf import message as _message\n"
       "from google.protobuf import reflection as _reflection\n"
-      "from google.protobuf import symbol_database as "
-      "_symbol_database\n");
+      );
   if (HasGenericServices(file)) {
     printer->Print(
         "from google.protobuf import service as _service\n"
@@ -191,8 +151,7 @@ void PrintTopBoilerplate(
         "from google.protobuf import descriptor_pb2\n");
   }
   printer->Print(
-      "# @@protoc_insertion_point(imports)\n\n"
-      "_sym_db = _symbol_database.Default()\n");
+    "# @@protoc_insertion_point(imports)\n");
   printer->Print("\n\n");
 }
 
@@ -258,14 +217,14 @@ string StringifyDefaultValue(const FieldDescriptor& field) {
     case FieldDescriptor::CPPTYPE_ENUM:
       return SimpleItoa(field.default_value_enum()->number());
     case FieldDescriptor::CPPTYPE_STRING:
-//##!PY25      return "b\"" + CEscape(field.default_value_string()) +
-//##!PY25             (field.type() != FieldDescriptor::TYPE_STRING ? "\"" :
-//##!PY25               "\".decode('utf-8')");
-      return "_b(\"" + CEscape(field.default_value_string()) +  //##PY25
-             (field.type() != FieldDescriptor::TYPE_STRING ? "\")" :  //##PY25
-               "\").decode('utf-8')");  //##PY25
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "None";
+      if (field.type() == FieldDescriptor::TYPE_STRING) {
+        return "unicode(\"" + CEscape(field.default_value_string()) +
+                        "\", \"utf-8\")";
+      } else {
+        return "\"" + CEscape(field.default_value_string()) + "\"";
+      }
+      case FieldDescriptor::CPPTYPE_MESSAGE:
+          return "None";
   }
   // (We could add a default case above but then we wouldn't get the nice
   // compiler warning when a new type is added.)
@@ -273,19 +232,6 @@ string StringifyDefaultValue(const FieldDescriptor& field) {
   return "";
 }
 
-string StringifySyntax(FileDescriptor::Syntax syntax) {
-  switch (syntax) {
-    case FileDescriptor::SYNTAX_PROTO2:
-      return "proto2";
-    case FileDescriptor::SYNTAX_PROTO3:
-      return "proto3";
-    case FileDescriptor::SYNTAX_UNKNOWN:
-    default:
-      GOOGLE_LOG(FATAL) << "Unsupported syntax; this generator only supports proto2 "
-                    "and proto3 syntax.";
-      return "";
-  }
-}
 
 
 }  // namespace
@@ -321,7 +267,7 @@ bool Generator::Generate(const FileDescriptor* file,
   fdp.SerializeToString(&file_descriptor_serialized_);
 
 
-  google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
+  scoped_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
   GOOGLE_CHECK(output.get());
   io::Printer printer(output.get(), '$');
   printer_ = &printer;
@@ -357,12 +303,9 @@ bool Generator::Generate(const FileDescriptor* file,
 // Prints Python imports for all modules imported by |file|.
 void Generator::PrintImports() const {
   for (int i = 0; i < file_->dependency_count(); ++i) {
-    const string& filename = file_->dependency(i)->name();
-    string import_statement = ModuleImportStatement(filename);
-    string module_alias = ModuleAlias(filename);
-    printer_->Print("$statement$ as $alias$\n", "statement",
-                    import_statement, "alias", module_alias);
-    CopyPublicDependenciesAliases(module_alias, file_->dependency(i));
+    string module_name = ModuleName(file_->dependency(i)->name());
+    printer_->Print("import $module$\n", "module",
+                    module_name);
   }
   printer_->Print("\n");
 
@@ -380,35 +323,21 @@ void Generator::PrintFileDescriptor() const {
   m["descriptor_name"] = kDescriptorKey;
   m["name"] = file_->name();
   m["package"] = file_->package();
-  m["syntax"] = StringifySyntax(file_->syntax());
   const char file_descriptor_template[] =
       "$descriptor_name$ = _descriptor.FileDescriptor(\n"
       "  name='$name$',\n"
-      "  package='$package$',\n"
-      "  syntax='$syntax$',\n";
+      "  package='$package$',\n";
   printer_->Print(m, file_descriptor_template);
   printer_->Indent();
   printer_->Print(
-//##!PY25      "serialized_pb=b'$value$'\n",
-      "serialized_pb=_b('$value$')\n",  //##PY25
+      "serialized_pb='$value$'",
       "value", strings::CHexEscape(file_descriptor_serialized_));
-  if (file_->dependency_count() != 0) {
-    printer_->Print(",\ndependencies=[");
-    for (int i = 0; i < file_->dependency_count(); ++i) {
-      string module_alias = ModuleAlias(file_->dependency(i)->name());
-      printer_->Print("$module_alias$.DESCRIPTOR,", "module_alias",
-                      module_alias);
-    }
-    printer_->Print("]");
-  }
 
   // TODO(falk): Also print options and fix the message_type, enum_type,
   //             service and extension later in the generation.
 
   printer_->Outdent();
   printer_->Print(")\n");
-  printer_->Print("_sym_db.RegisterFileDescriptor($name$)\n", "name",
-                  kDescriptorKey);
   printer_->Print("\n");
 }
 
@@ -429,7 +358,7 @@ void Generator::PrintTopLevelEnums() const {
     for (int j = 0; j < enum_descriptor.value_count(); ++j) {
       const EnumValueDescriptor& value_descriptor = *enum_descriptor.value(j);
       top_level_enum_values.push_back(
-          std::make_pair(value_descriptor.name(), value_descriptor.number()));
+          make_pair(value_descriptor.name(), value_descriptor.number()));
     }
   }
 
@@ -453,9 +382,7 @@ void Generator::PrintAllNestedEnumsInFile() const {
 // enum_descriptor.
 void Generator::PrintEnum(const EnumDescriptor& enum_descriptor) const {
   map<string, string> m;
-  string module_level_descriptor_name =
-      ModuleLevelDescriptorName(enum_descriptor);
-  m["descriptor_name"] = module_level_descriptor_name;
+  m["descriptor_name"] = ModuleLevelDescriptorName(enum_descriptor);
   m["name"] = enum_descriptor.name();
   m["full_name"] = enum_descriptor.full_name();
   m["file"] = kDescriptorKey;
@@ -485,8 +412,6 @@ void Generator::PrintEnum(const EnumDescriptor& enum_descriptor) const {
   PrintSerializedPbInterval(enum_descriptor, edp);
   printer_->Outdent();
   printer_->Print(")\n");
-  printer_->Print("_sym_db.RegisterEnumDescriptor($name$)\n", "name",
-                  module_level_descriptor_name);
   printer_->Print("\n");
 }
 
@@ -595,38 +520,29 @@ void Generator::PrintServiceDescriptor(
   printer_->Print("])\n\n");
 }
 
-
-void Generator::PrintDescriptorKeyAndModuleName(
-    const ServiceDescriptor& descriptor) const {
-  printer_->Print(
-      "$descriptor_key$ = $descriptor_name$,\n",
-      "descriptor_key", kDescriptorKey,
-      "descriptor_name", ModuleLevelServiceDescriptorName(descriptor));
-  printer_->Print(
-      "__module__ = '$module_name$'\n",
-      "module_name", ModuleName(file_->name()));
-}
-
 void Generator::PrintServiceClass(const ServiceDescriptor& descriptor) const {
   // Print the service.
-  printer_->Print("$class_name$ = service_reflection.GeneratedServiceType("
-                  "'$class_name$', (_service.Service,), dict(\n",
+  printer_->Print("class $class_name$(_service.Service):\n",
                   "class_name", descriptor.name());
   printer_->Indent();
-  Generator::PrintDescriptorKeyAndModuleName(descriptor);
-  printer_->Print("))\n\n");
+  printer_->Print(
+      "__metaclass__ = service_reflection.GeneratedServiceType\n"
+      "$descriptor_key$ = $descriptor_name$\n",
+      "descriptor_key", kDescriptorKey,
+      "descriptor_name", ModuleLevelServiceDescriptorName(descriptor));
   printer_->Outdent();
 }
 
 void Generator::PrintServiceStub(const ServiceDescriptor& descriptor) const {
   // Print the service stub.
-  printer_->Print("$class_name$_Stub = "
-                  "service_reflection.GeneratedServiceStubType("
-                  "'$class_name$_Stub', ($class_name$,), dict(\n",
+  printer_->Print("class $class_name$_Stub($class_name$):\n",
                   "class_name", descriptor.name());
   printer_->Indent();
-  Generator::PrintDescriptorKeyAndModuleName(descriptor);
-  printer_->Print("))\n\n");
+  printer_->Print(
+      "__metaclass__ = service_reflection.GeneratedServiceStubType\n"
+      "$descriptor_key$ = $descriptor_name$\n",
+      "descriptor_key", kDescriptorKey,
+      "descriptor_name", ModuleLevelServiceDescriptorName(descriptor));
   printer_->Outdent();
 }
 
@@ -680,12 +596,10 @@ void Generator::PrintDescriptor(const Descriptor& message_descriptor) const {
   message_descriptor.options().SerializeToString(&options_string);
   printer_->Print(
       "options=$options_value$,\n"
-      "is_extendable=$extendable$,\n"
-      "syntax='$syntax$'",
+      "is_extendable=$extendable$",
       "options_value", OptionsValue("MessageOptions", options_string),
       "extendable", message_descriptor.extension_range_count() > 0 ?
-                      "True" : "False",
-      "syntax", StringifySyntax(message_descriptor.file()->syntax()));
+                      "True" : "False");
   printer_->Print(",\n");
 
   // Extension ranges
@@ -698,22 +612,7 @@ void Generator::PrintDescriptor(const Descriptor& message_descriptor) const {
                     "end", SimpleItoa(range->end));
   }
   printer_->Print("],\n");
-  printer_->Print("oneofs=[\n");
-  printer_->Indent();
-  for (int i = 0; i < message_descriptor.oneof_decl_count(); ++i) {
-    const OneofDescriptor* desc = message_descriptor.oneof_decl(i);
-    map<string, string> m;
-    m["name"] = desc->name();
-    m["full_name"] = desc->full_name();
-    m["index"] = SimpleItoa(desc->index());
-    printer_->Print(
-        m,
-        "_descriptor.OneofDescriptor(\n"
-        "  name='$name$', full_name='$full_name$',\n"
-        "  index=$index$, containing_type=None, fields=[]),\n");
-  }
-  printer_->Outdent();
-  printer_->Print("],\n");
+
   // Serialization of proto
   DescriptorProto edp;
   PrintSerializedPbInterval(message_descriptor, edp);
@@ -736,12 +635,7 @@ void Generator::PrintNestedDescriptors(
 // Prints all messages in |file|.
 void Generator::PrintMessages() const {
   for (int i = 0; i < file_->message_type_count(); ++i) {
-    vector<string> to_register;
-    PrintMessage(*file_->message_type(i), "", &to_register);
-    for (int j = 0; j < to_register.size(); ++j) {
-      printer_->Print("_sym_db.RegisterMessage($name$)\n", "name",
-                      to_register[j]);
-    }
+    PrintMessage(*file_->message_type(i));
     printer_->Print("\n");
   }
 }
@@ -753,40 +647,33 @@ void Generator::PrintMessages() const {
 // reflection.py will use to construct the meat of the class itself.
 //
 // Mutually recursive with PrintNestedMessages().
-// Collect nested message names to_register for the symbol_database.
-void Generator::PrintMessage(const Descriptor& message_descriptor,
-                             const string& prefix,
-                             vector<string>* to_register) const {
-  string qualified_name(prefix + message_descriptor.name());
-  to_register->push_back(qualified_name);
-  printer_->Print(
-      "$name$ = _reflection.GeneratedProtocolMessageType('$name$', "
-      "(_message.Message,), dict(\n",
-      "name", message_descriptor.name());
+void Generator::PrintMessage(
+    const Descriptor& message_descriptor) const {
+  printer_->Print("class $name$(_message.Message):\n", "name",
+                  message_descriptor.name());
   printer_->Indent();
-
-  PrintNestedMessages(message_descriptor, qualified_name + ".", to_register);
+  printer_->Print("__metaclass__ = _reflection.GeneratedProtocolMessageType\n");
+  PrintNestedMessages(message_descriptor);
   map<string, string> m;
   m["descriptor_key"] = kDescriptorKey;
   m["descriptor_name"] = ModuleLevelDescriptorName(message_descriptor);
-  printer_->Print(m, "$descriptor_key$ = $descriptor_name$,\n");
-  printer_->Print("__module__ = '$module_name$'\n",
-                  "module_name", ModuleName(file_->name()));
-  printer_->Print("# @@protoc_insertion_point(class_scope:$full_name$)\n",
-                  "full_name", message_descriptor.full_name());
-  printer_->Print("))\n");
+  printer_->Print(m, "$descriptor_key$ = $descriptor_name$\n");
+
+  printer_->Print(
+    "\n"
+    "# @@protoc_insertion_point(class_scope:$full_name$)\n",
+    "full_name", message_descriptor.full_name());
+
   printer_->Outdent();
 }
 
 // Prints all nested messages within |containing_descriptor|.
 // Mutually recursive with PrintMessage().
-void Generator::PrintNestedMessages(const Descriptor& containing_descriptor,
-                                    const string& prefix,
-                                    vector<string>* to_register) const {
+void Generator::PrintNestedMessages(
+    const Descriptor& containing_descriptor) const {
   for (int i = 0; i < containing_descriptor.nested_type_count(); ++i) {
     printer_->Print("\n");
-    PrintMessage(*containing_descriptor.nested_type(i), prefix, to_register);
-    printer_->Print(",\n");
+    PrintMessage(*containing_descriptor.nested_type(i));
   }
 }
 
@@ -814,23 +701,6 @@ void Generator::FixForeignFieldsInDescriptor(
     const EnumDescriptor& enum_descriptor = *descriptor.enum_type(i);
     FixContainingTypeInDescriptor(enum_descriptor, &descriptor);
   }
-  for (int i = 0; i < descriptor.oneof_decl_count(); ++i) {
-    map<string, string> m;
-    const OneofDescriptor* oneof = descriptor.oneof_decl(i);
-    m["descriptor_name"] = ModuleLevelDescriptorName(descriptor);
-    m["oneof_name"] = oneof->name();
-    for (int j = 0; j < oneof->field_count(); ++j) {
-      m["field_name"] = oneof->field(j)->name();
-      printer_->Print(
-          m,
-          "$descriptor_name$.oneofs_by_name['$oneof_name$'].fields.append(\n"
-          "  $descriptor_name$.fields_by_name['$field_name$'])\n");
-      printer_->Print(
-          m,
-          "$descriptor_name$.fields_by_name['$field_name$'].containing_oneof = "
-          "$descriptor_name$.oneofs_by_name['$oneof_name$']\n");
-    }
-  }
 }
 
 void Generator::AddMessageToFileDescriptor(const Descriptor& descriptor) const {
@@ -844,29 +714,6 @@ void Generator::AddMessageToFileDescriptor(const Descriptor& descriptor) const {
   printer_->Print(m, file_descriptor_template);
 }
 
-void Generator::AddEnumToFileDescriptor(
-    const EnumDescriptor& descriptor) const {
-  map<string, string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["enum_name"] = descriptor.name();
-  m["enum_descriptor_name"] = ModuleLevelDescriptorName(descriptor);
-  const char file_descriptor_template[] =
-      "$descriptor_name$.enum_types_by_name['$enum_name$'] = "
-      "$enum_descriptor_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
-void Generator::AddExtensionToFileDescriptor(
-    const FieldDescriptor& descriptor) const {
-  map<string, string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["field_name"] = descriptor.name();
-  const char file_descriptor_template[] =
-      "$descriptor_name$.extensions_by_name['$field_name$'] = "
-      "$field_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
 // Sets any necessary message_type and enum_type attributes
 // for the Python version of |field|.
 //
@@ -931,7 +778,7 @@ void Generator::FixContainingTypeInDescriptor(
     const string parent_name = ModuleLevelDescriptorName(
         *containing_descriptor);
     printer_->Print(
-        "$nested_name$.containing_type = $parent_name$\n",
+        "$nested_name$.containing_type = $parent_name$;\n",
         "nested_name", nested_name,
         "parent_name", parent_name);
   }
@@ -948,12 +795,6 @@ void Generator::FixForeignFieldsInDescriptors() const {
   for (int i = 0; i < file_->message_type_count(); ++i) {
     AddMessageToFileDescriptor(*file_->message_type(i));
   }
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    AddEnumToFileDescriptor(*file_->enum_type(i));
-  }
-  for (int i = 0; i < file_->extension_count(); ++i) {
-    AddExtensionToFileDescriptor(*file_->extension(i));
-  }
   printer_->Print("\n");
 }
 
@@ -1034,10 +875,8 @@ string Generator::OptionsValue(
     return "None";
   } else {
     string full_class_name = "descriptor_pb2." + class_name;
-//##!PY25    return "_descriptor._ParseOptions(" + full_class_name + "(), b'"
-//##!PY25        + CEscape(serialized_options)+ "')";
-    return "_descriptor._ParseOptions(" + full_class_name + "(), _b('"  //##PY25
-        + CEscape(serialized_options)+ "'))";  //##PY25
+    return "_descriptor._ParseOptions(" + full_class_name + "(), '"
+        + CEscape(serialized_options)+ "')";
   }
 }
 
@@ -1140,7 +979,7 @@ string Generator::ModuleLevelDescriptorName(
   // We now have the name relative to its own module.  Also qualify with
   // the module name iff this descriptor is from a different .proto file.
   if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
+    name = ModuleName(descriptor.file()->name()) + "." + name;
   }
   return name;
 }
@@ -1152,7 +991,7 @@ string Generator::ModuleLevelDescriptorName(
 string Generator::ModuleLevelMessageName(const Descriptor& descriptor) const {
   string name = NamePrefixedWithNestedTypes(descriptor, ".");
   if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
+    name = ModuleName(descriptor.file()->name()) + "." + name;
   }
   return name;
 }
@@ -1165,7 +1004,7 @@ string Generator::ModuleLevelServiceDescriptorName(
   UpperString(&name);
   name = "_" + name;
   if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
+    name = ModuleName(descriptor.file()->name()) + "." + name;
   }
   return name;
 }
@@ -1312,18 +1151,6 @@ void Generator::FixOptionsForMessage(const Descriptor& descriptor) const {
   }
 }
 
-// If a dependency forwards other files through public dependencies, let's
-// copy over the corresponding module aliases.
-void Generator::CopyPublicDependenciesAliases(
-    const string& copy_from, const FileDescriptor* file) const {
-  for (int i = 0; i < file->public_dependency_count(); ++i) {
-    string module_alias = ModuleAlias(file->public_dependency(i)->name());
-    printer_->Print("$alias$ = $copy_from$.$alias$\n", "alias", module_alias,
-                    "copy_from", copy_from);
-    CopyPublicDependenciesAliases(copy_from, file->public_dependency(i));
-  }
-}
-
 }  // namespace python
 }  // namespace compiler
 }  // namespace protobuf