Backport PR #2486: Add initial support for Jupyter 4.0

spyderlib/plugins/ipythonconsole.py

@@ -31,8 +31,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
 try: # IPython = "<=2.0"
     from IPython.external.ssh import tunnel as zmqtunnel
@@ -1007,7 +1006,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()
@@ -1057,7 +1056,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)