Merge remote-tracking branch 'origin/master'

python/src/com/jetbrains/python/debugger/PyDebugProcess.java

@@ -635,8 +635,8 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
 
   private void setKillingStrategy() {
     if (myProcessHandler instanceof PythonProcessHandler) {
-      ((PythonProcessHandler)myProcessHandler)
-        .setShouldTryToKillSoftly(false);    //while process is suspended it can't terminate softly,
+      ((PythonProcessHandler)myProcessHandler).setShouldKillProcessSoftly(false);
+      //while process is suspended it can't terminate softly,
       //multiple processes in debug mode also can not terminate properly
       //so its better to kill all the tree in a hard way
     }

python/src/com/jetbrains/python/run/PythonProcessHandler.java

@@ -11,8 +11,6 @@ import java.nio.charset.Charset;
  * @author traff
  */
 public class PythonProcessHandler extends KillableColoredProcessHandler {
-  private boolean myShouldTryToKillSoftly = true;
-
   protected PythonProcessHandler(@NotNull Process process, @NotNull GeneralCommandLine commandLine) {
     super(process, commandLine.getCommandLineString());
   }
@@ -21,15 +19,6 @@ public class PythonProcessHandler extends KillableColoredProcessHandler {
     super(process, commandLine, charset);
   }
 
-  public void setShouldTryToKillSoftly(boolean shouldTryToKillSoftly) {
-    myShouldTryToKillSoftly = shouldTryToKillSoftly;
-  }
-
-  @Override
-  protected boolean shouldKillProcessSoftly() {
-    return myShouldTryToKillSoftly;
-  }
-
   @Override
   protected boolean shouldDestroyProcessRecursively() {
     return true;