mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3430 from minrk/configinstance

Browse Source 
add parent to Configurable
This commit is contained in:
Brian E. Granger 2013-06-30 21:27:46 -07:00
commit c323717fe7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/html/base/zmqhandlers.py
View File

@ -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

6
IPython/html/notebookapp.py
View File

@ -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):