Merge branch 'akoshevoy/path_mappers'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 13:51:37 +0000 (16:51 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 13:51:37 +0000 (16:51 +0300)
1  2 
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java

index 501d4bfac06c42e85299c8aa853449724b298751,c495485f5e7a5688eefd39637fcc4be346176801..b882e8084e8dd96313d9bb4f22737ab0d74ae40b
@@@ -184,11 -185,11 +185,11 @@@ public abstract class PythonCommandLine
      Sdk sdk = PythonSdkType.findSdkByPath(myConfig.getInterpreterPath());
      final ProcessHandler processHandler;
      if (PySdkUtil.isRemote(sdk)) {
-       processHandler =
-         createRemoteProcessStarter().startRemoteProcess(sdk, commandLine, myConfig.getProject(), myConfig.getMappingSettings());
+       PyRemotePathMapper pathMapper = createRemotePathMapper();
+       processHandler = createRemoteProcessStarter().startRemoteProcess(sdk, commandLine, myConfig.getProject(), pathMapper);
      }
      else {
 -      EncodingEnvironmentUtil.fixDefaultEncodingIfMac(commandLine, myConfig.getProject());
 +      EncodingEnvironmentUtil.setLocaleEnvironmentIfMac(commandLine);
        processHandler = doCreateProcess(commandLine);
        ProcessTerminatedListener.attach(processHandler);
      }