Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

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

 // 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 28 matching lines @@
 #include <google/protobuf/stubs/shared_ptr.h>
 #endif
 
 #include <google/protobuf/compiler/python/python_generator.h>
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/io/printer.h>
 
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/testing/file.h>
-#include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 namespace google {
 namespace protobuf {
 namespace compiler {
 namespace python {
 namespace {
 
 class TestGenerator : public CodeGenerator {
@@ skipping 49 matching lines @@
     "protoc",
     proto_path.c_str(),
     python_out.c_str(),
     test_out.c_str(),
     "test.proto"
   };
 
   EXPECT_EQ(0, cli.Run(5, argv));
 }
 
-// This test verifies that the generated Python output uses regular imports (as
-// opposed to importlib) in the usual case where the .proto file paths do not
-// not contain any Python keywords.
-TEST(PythonPluginTest, ImportTest) {
-  // Create files test1.proto and test2.proto with the former importing the
-  // latter.
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test1.proto",
-                             "syntax = \"proto3\";\n"
-                             "package foo;\n"
-                             "import \"test2.proto\";"
-                             "message Message1 {\n"
-                             "  Message2 message_2 = 1;\n"
-                             "}\n",
-                             true));
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test2.proto",
-                             "syntax = \"proto3\";\n"
-                             "package foo;\n"
-                             "message Message2 {}\n",
-                             true));
-
-  google::protobuf::compiler::CommandLineInterface cli;
-  cli.SetInputsAreProtoPathRelative(true);
-  python::Generator python_generator;
-  cli.RegisterGenerator("--python_out", &python_generator, "");
-  string proto_path = "-I" + TestTempDir();
-  string python_out = "--python_out=" + TestTempDir();
-  const char* argv[] = {"protoc", proto_path.c_str(), "-I.", python_out.c_str(),
-                        "test1.proto"};
-  ASSERT_EQ(0, cli.Run(5, argv));
-
-  // Loop over the lines of the generated code and verify that we find an
-  // ordinary Python import but do not find the string "importlib".
-  string output;
-  GOOGLE_CHECK_OK(File::GetContents(TestTempDir() + "/test1_pb2.py", &output,
-                             true));
-  std::vector<string> lines = Split(output, "\n");
-  string expected_import = "import test2_pb2";
-  bool found_expected_import = false;
-  for (int i = 0; i < lines.size(); ++i) {
-    if (lines[i].find(expected_import) != string::npos) {
-      found_expected_import = true;
-    }
-    EXPECT_EQ(string::npos, lines[i].find("importlib"));
-  }
-  EXPECT_TRUE(found_expected_import);
-}
-
 }  // namespace
 }  // namespace python
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google