Merge.
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:13:15 +0000 (23:13 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 31 Aug 2015 21:13:15 +0000 (23:13 +0200)
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java

index 04ce2139bac9fe6d4cde73686adb1cca34159d92..96521ca75cffe220c2b11363df3b2ce78169a58d 100644 (file)
@@ -265,7 +265,6 @@ public final class IpnbConnectionManager implements ProjectComponent {
     }
     catch (ExecutionException ignored) {
     }
-    final Map<String, String> env = ImmutableMap.of("PYCHARM_EP_DIST", "ipython", "PYCHARM_EP_NAME", "ipython");
 
     final Pair<String, String> hostPort = getHostPortFromUrl(url);
     if (hostPort == null) {
@@ -281,7 +280,7 @@ public final class IpnbConnectionManager implements ProjectComponent {
     String ipython = findIPythonRunner(homePath);
     Map<String, String> env = null;
     if (ipython == null) {
-      ipython = PythonHelpersLocator.getHelperPath("pycharm/pycharm_load_entry_point.py");
+      ipython = PythonHelper.LOAD_ENTRY_POINT.asParamString();
       env = ImmutableMap.of("PYCHARM_EP_DIST", "ipython", "PYCHARM_EP_NAME", "ipython");
     }