Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using IPython.lib.kernel 0.13.2 shim and add initial support for Jupyter #2486

Merged
merged 2 commits into from
Jun 16, 2015
Merged

Stop using IPython.lib.kernel 0.13.2 shim and add initial support for Jupyter #2486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48ba22f
stop using 0.13.2 shim
SylvainCorlay Jun 13, 2015
f36ef76
profile optional argument does not exist in IPython 4.0
SylvainCorlay Jun 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spyderlib/plugins/ipythonconsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

# IPython imports
from IPython.core.application import get_ipython_dir
from IPython.lib.kernel import find_connection_file
from IPython.kernel.connect import find_connection_file
from IPython.qt.manager import QtKernelManager

# Ssh imports
Expand Down Expand Up @@ -1007,7 +1007,7 @@ def create_kernel_manager_and_client(self, connection_file=None,
hostname=None, sshkey=None,
password=None):
"""Create kernel manager and client"""
cf = find_connection_file(connection_file, profile='default')
cf = find_connection_file(connection_file)
kernel_manager = QtKernelManager(connection_file=cf, config=None)
kernel_client = kernel_manager.client()
kernel_client.load_connection_file()
Expand Down Expand Up @@ -1058,7 +1058,7 @@ def _create_client_for_kernel(self, cf, hostname, kf, pw):
# Verifying if the connection file exists
cf = osp.basename(cf)
try:
find_connection_file(cf, profile='default')
find_connection_file(cf)
except (IOError, UnboundLocalError):
QMessageBox.critical(self, _('IPython'),
_("Unable to connect to IPython <b>%s") % cf)
Expand Down