From bd03a99e28097f01d1356015ea681a2c8786e7d1 Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 14 Jun 2013 11:02:56 -0400 Subject: [PATCH] use `parent=self` throughout IPython instead of `config=self.config` only real effective change: IPythonKernelApp.parent has been renamed to IPKernelApp.parent_handle. --- IPython/html/base/zmqhandlers.py | 2 +- IPython/html/notebookapp.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IPython/html/base/zmqhandlers.py b/IPython/html/base/zmqhandlers.py index 19778eef9..4bc24745d 100644 --- a/IPython/html/base/zmqhandlers.py +++ b/IPython/html/base/zmqhandlers.py @@ -84,7 +84,7 @@ class AuthenticatedZMQStreamHandler(ZMQStreamHandler, IPythonHandler): def open(self, kernel_id): self.kernel_id = kernel_id.decode('ascii') - self.session = Session(config=self.config) + self.session = Session(parent=self) self.save_on_message = self.on_message self.on_message = self.on_first_message diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index 91bcffe67..c3d3f11c5 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -522,13 +522,13 @@ class NotebookApp(BaseIPythonApplication): # force Session default to be secure default_secure(self.config) self.kernel_manager = MappingKernelManager( - config=self.config, log=self.log, kernel_argv=self.kernel_argv, + parent=self, log=self.log, kernel_argv=self.kernel_argv, connection_dir = self.profile_dir.security_dir, ) kls = import_item(self.notebook_manager_class) - self.notebook_manager = kls(config=self.config, log=self.log) + self.notebook_manager = kls(parent=self, log=self.log) self.notebook_manager.load_notebook_names() - self.cluster_manager = ClusterManager(config=self.config, log=self.log) + self.cluster_manager = ClusterManager(parent=self, log=self.log) self.cluster_manager.update_profiles() def init_logging(self):