Revert accidently committed from another changelist appcode/163.4074 clion/163.4070 dbe/163.4071 idea/163.4073 phpstorm/163.4075 pycharm/163.4068 pycharm/163.4072 rubymine/163.4076 webstorm/163.4078
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 6 Sep 2016 22:13:04 +0000 (00:13 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 6 Sep 2016 22:13:04 +0000 (00:13 +0200)
python/src/com/jetbrains/python/sdk/PySdkUtil.java

index 3dd46f8f85057e12e400ada1653976c1e0a70965..afd2f51c3d87636aa30576f4094dadfba44500cb 100644 (file)
@@ -33,7 +33,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.remote.RemoteSdkAdditionalData;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.HashMap;
-import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -124,12 +123,9 @@ public class PySdkUtil {
     final Map<String, String> env = extraEnv != null ? mergeEnvVariables(expandedCmdEnv, extraEnv) : expandedCmdEnv;
     PythonEnvUtil.resetHomePathChanges(homePath, env);
     try {
-      final GeneralCommandLine cmdLine = cmd.withWorkDirectory(homePath).withEnvironment(env);
-      final PythonSdkFlavor flavor = PythonSdkFlavor.getFlavor(cmdLine.getExePath());
-      if (flavor != null) {
-        flavor.patchHelperCommandLine(cmdLine);
-      }
-      final CapturingProcessHandler processHandler = new CapturingProcessHandler(cmdLine);
+
+      final GeneralCommandLine commandLine = cmd.withWorkDirectory(homePath).withEnvironment(env);
+      final CapturingProcessHandler processHandler = new CapturingProcessHandler(commandLine);
       if (stdin != null) {
         final OutputStream processInput = processHandler.getProcessInput();
         assert processInput != null;