Remove some dead code from PythonConfigurationLoader.

There doesn't seem to be any need for a C++ toolchain to create a Python config
anymore. I looked through the change history, but didn't find any obvious
culprits / reasons for the current code.

--
MOS_MIGRATED_REVID=132429818

3 files changed, 3 insertions, 41 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index f2678a6a8b..fd0814bde4 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -481,7 +481,7 @@ public class BazelRuleClassProvider {
 
     builder.addConfigurationOptions(AppleCommandLineOptions.class);
     builder.addConfigurationFragment(new AppleConfiguration.Loader());
-    builder.addConfigurationFragment(new PythonConfigurationLoader(Functions.<String>identity()));
+    builder.addConfigurationFragment(new PythonConfigurationLoader());
     builder.addConfigurationFragment(new BazelPythonConfiguration.Loader());
     builder.addConfigurationFragment(new ObjcConfigurationLoader());
     builder.addConfigurationFragment(new J2ObjcConfiguration.Loader());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
index ff49b2d9b3..d85c586412 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonConfigurationLoader.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.python;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
@@ -21,59 +20,22 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
-import com.google.devtools.build.lib.rules.cpp.CppOptions;
-import com.google.devtools.build.lib.rules.cpp.CrosstoolConfigurationLoader;
-import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig;
-import javax.annotation.Nullable;
 
 /**
  * A factory implementation for {@link PythonConfiguration} objects.
  */
 public class PythonConfigurationLoader implements ConfigurationFragmentFactory {
-  private final Function<String, String> cpuTransformer;
-
-  public PythonConfigurationLoader(Function<String, String> cpuTransformer) {
-    this.cpuTransformer = cpuTransformer;
-  }
-
   @Override
   public ImmutableSet<Class<? extends FragmentOptions>> requiredOptions() {
-    return ImmutableSet.of(PythonOptions.class, CppOptions.class);
-  }
-
-  @Nullable
-  private CrosstoolConfig.CToolchain getToolchain(
-      ConfigurationEnvironment env, BuildOptions buildOptions, Label crosstoolTop)
-      throws InvalidConfigurationException, InterruptedException {
-    CrosstoolConfigurationLoader.CrosstoolFile file =
-        CrosstoolConfigurationLoader.readCrosstool(env, crosstoolTop);
-    if (file == null) {
-      return null;
-    }
-    return CrosstoolConfigurationLoader.selectToolchain(
-        file.getProto(), buildOptions, cpuTransformer);
+    return ImmutableSet.<Class<? extends FragmentOptions>>of(PythonOptions.class);
   }
 
   @Override
   public PythonConfiguration create(ConfigurationEnvironment env, BuildOptions buildOptions)
       throws InvalidConfigurationException, InterruptedException {
     PythonOptions pythonOptions = buildOptions.get(PythonOptions.class);
-    CppConfiguration cppConfiguration = env.getFragment(buildOptions, CppConfiguration.class);
-    if (cppConfiguration == null) {
-      return null;
-    }
-
-    CrosstoolConfig.CToolchain toolchain = getToolchain(
-        env, buildOptions, buildOptions.get(CppOptions.class).crosstoolTop);
-    if (toolchain == null) {
-      return null;
-    }
-
     boolean ignorePythonVersionAttribute = pythonOptions.forcePython != null;
     PythonVersion pythonVersion = pythonOptions.getPythonVersion();
-
     return new PythonConfiguration(pythonVersion, ignorePythonVersionAttribute);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 0a7452d7b0..3ad2173eeb 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -223,7 +223,7 @@ public final class BazelAnalysisMock extends AnalysisMock {
     return new ConfigurationFactory(new BazelConfigurationCollection(),
         new BazelConfiguration.Loader(),
         new CppConfigurationLoader(Functions.<String>identity()),
-        new PythonConfigurationLoader(Functions.<String>identity()),
+        new PythonConfigurationLoader(),
         new BazelPythonConfiguration.Loader(),
         new JvmConfigurationLoader(BazelRuleClassProvider.JAVA_CPU_SUPPLIER),
         new JavaConfigurationLoader(),