Merge branch 'master' into traff/zip_helpers
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:10:02 +0000 (23:10 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:10:02 +0000 (23:10 +0200)
# Conflicts:
# platform/util/src/com/intellij/openapi/util/BuildNumber.java
# python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java

1  2 
python/helpers/pydev/pydevd.py
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java
python/src/com/jetbrains/python/run/PythonTask.java
python/src/com/jetbrains/python/sdk/PythonSdkType.java

Simple merge
index a237a22661418463bd4508b1f92dd531ee5a8077,19436e4b20f8dad75b0412c2ac32b71ee77b01ae..a75e8b8070e763fcd014dac73d807d17bc8b3f4e
@@@ -54,11 -54,11 +54,11 @@@ public class PydevConsoleRunnerFactory 
      String[] setupFragment;
  
      PyConsoleOptions.PyConsoleSettings settingsProvider = PyConsoleOptions.getInstance(project).getPythonConsoleSettings();
 -    Collection<String> pythonPath = PythonCommandLineState.collectPythonPath(module, settingsProvider.addContentRoots(),
 -                                                                             settingsProvider.addSourceRoots());
 +    Collection<String> pythonPath = PythonCommandLineState.collectPythonPath(module, settingsProvider.shouldAddContentRoots(),
 +                                                                             settingsProvider.shouldAddSourceRoots());
  
-     if (mappingSettings != null) {
-       pythonPath = mappingSettings.convertToRemote(pythonPath);
+     if (pathMapper != null) {
+       pythonPath = pathMapper.convertToRemote(pythonPath);
      }
  
      String customStartScript = settingsProvider == null ? "" : settingsProvider.getCustomStartScript();