From 9f1d0dcdd461efa2a3549e4f3bdae17c3f2b45ea Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 6 Jun 2013 15:58:22 +0400
Subject: [PATCH] reverted fix for PY-9920 according to discussion CR-IC-1139

another fix for PY-9920 (added collapse recursively paths for number of configuration)
---
 .../src/com/jetbrains/python/run/PythonRunConfiguration.java   | 3 ++-
 .../testing/nosetest/PythonNoseTestRunConfiguration.java       | 2 ++
 .../python/testing/pytest/PyTestRunConfiguration.java          | 2 ++
 .../testing/unittest/PythonUnitTestRunConfiguration.java       | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/run/PythonRunConfiguration.java b/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
index dc668d9fa449..2e57a68be6aa 100644
--- a/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
@@ -5,8 +5,8 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.filters.Filter;
-import com.intellij.execution.filters.UrlFilter;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.InvalidDataException;
@@ -104,6 +104,7 @@ public class PythonRunConfiguration extends AbstractPythonRunConfiguration
     super.writeExternal(element);
     JDOMExternalizerUtil.writeField(element, SCRIPT_NAME, myScriptName);
     JDOMExternalizerUtil.writeField(element, PARAMETERS, myScriptParameters);
+    PathMacroManager.getInstance(getProject()).collapsePathsRecursively(element);
   }
 
   public AbstractPythonRunConfigurationParams getBaseParams() {
diff --git a/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
index a27c2d9551b5..c4039d60de1f 100644
--- a/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
@@ -4,6 +4,7 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.InvalidDataException;
@@ -54,6 +55,7 @@ public class PythonNoseTestRunConfiguration extends AbstractPythonTestRunConfigu
     super.writeExternal(element);
     JDOMExternalizerUtil.writeField(element, "PARAMS", myParams);
     JDOMExternalizerUtil.writeField(element, "USE_PARAM", String.valueOf(useParam));
+    PathMacroManager.getInstance(getProject()).collapsePathsRecursively(element);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
index 59d6c9d206aa..e3dbee950a58 100644
--- a/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
@@ -4,6 +4,7 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.InvalidDataException;
@@ -114,6 +115,7 @@ public class PyTestRunConfiguration extends AbstractPythonTestRunConfiguration i
     JDOMExternalizerUtil.writeField(element, PARAMS_FIELD, myParams);
     JDOMExternalizerUtil.writeField(element, "USE_PARAM", String.valueOf(useParam));
     JDOMExternalizerUtil.writeField(element, "USE_KEYWORD", String.valueOf(useKeyword));
+    PathMacroManager.getInstance(getProject()).collapsePathsRecursively(element);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
index 6acf0f8d9a6b..fd94c6249aee 100644
--- a/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
@@ -4,6 +4,7 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
@@ -60,6 +61,7 @@ public class PythonUnitTestRunConfiguration extends
     JDOMExternalizerUtil.writeField(element, "PUREUNITTEST", String.valueOf(myIsPureUnittest));
     JDOMExternalizerUtil.writeField(element, "PARAMS", myParams);
     JDOMExternalizerUtil.writeField(element, "USE_PARAM", String.valueOf(useParam));
+    PathMacroManager.getInstance(getProject()).collapsePathsRecursively(element);
   }
 
   @Override