MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix according IDEA-CR-16798 for issue PY-21905

Browse Source
This commit is contained in:
Ekaterina Tuzova
2016-12-14 18:20:08 +03:00
parent a868a640d5
commit e5b783eaef
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
+6
View File
@@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.GuiUtils;
import com.intellij.ui.HyperlinkAdapter;
import com.intellij.util.TimeoutUtil;
import com.intellij.util.text.VersionComparatorUtil;
import com.intellij.util.ui.UIUtil;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.packaging.PyPackage;
@@ -311,6 +312,11 @@ public final class IpnbConnectionManager implements ProjectComponent {
parameters.add("--port");
parameters.add(hostPort.getSecond());
}
final PyPackage notebookPackage = PyPackageUtil.findPackage(packages, "notebook");
if (notebookPackage != null && VersionComparatorUtil.compare(notebookPackage.getVersion(),
"4.3.0") >= 0) {
parameters.add("--NotebookApp.token=''");
}
final String arguments = ipnbSettings.getArguments();
if (!StringUtil.isEmptyOrSpaces(arguments)) {
parameters.addAll(StringUtil.split(arguments, " "));
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class IpnbSettings implements PersistentStateComponent<IpnbSettings> {
public static final String DEFAULT_URL = "http://127.0.0.1:8888";
public String URL = DEFAULT_URL;
private String myWorkingDirectory;
private String myArguments = "--NotebookApp.token=''";
private String myArguments = "";
public static IpnbSettings getInstance(@NotNull Project project) {
return ServiceManager.getService(project, IpnbSettings.class);