##// END OF EJS Templates
Merge pull request #2905 from minrk/kernel_parent_config...
Fernando Perez -
r9519:36679dc7 merge
parent child Browse files
Show More
@@ -68,7 +68,7 b' def embed_kernel(module=None, local_ns=None, **kwargs):'
68 The namespace to load into IPython user namespace (default: caller)
68 The namespace to load into IPython user namespace (default: caller)
69
69
70 kwargs : various, optional
70 kwargs : various, optional
71 Further keyword args are relayed to the KernelApp constructor,
71 Further keyword args are relayed to the IPKernelApp constructor,
72 allowing configuration of the Kernel. Will only have an effect
72 allowing configuration of the Kernel. Will only have an effect
73 on the first embed_kernel call for a given process.
73 on the first embed_kernel call for a given process.
74
74
@@ -194,7 +194,7 b' class IPythonConsoleApp(Configurable):'
194 argv = sys.argv[1:]
194 argv = sys.argv[1:]
195 self.kernel_argv = swallow_argv(argv, self.frontend_aliases, self.frontend_flags)
195 self.kernel_argv = swallow_argv(argv, self.frontend_aliases, self.frontend_flags)
196 # kernel should inherit default config file from frontend
196 # kernel should inherit default config file from frontend
197 self.kernel_argv.append("--KernelApp.parent_appname='%s'"%self.name)
197 self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name)
198
198
199 def init_connection_file(self):
199 def init_connection_file(self):
200 """find the connection file, and load the info if found.
200 """find the connection file, and load the info if found.
@@ -244,7 +244,7 b' class IPythonConsoleApp(Configurable):'
244
244
245 def load_connection_file(self):
245 def load_connection_file(self):
246 """load ip/port/hmac config from JSON connection file"""
246 """load ip/port/hmac config from JSON connection file"""
247 # this is identical to KernelApp.load_connection_file
247 # this is identical to IPKernelApp.load_connection_file
248 # perhaps it can be centralized somewhere?
248 # perhaps it can be centralized somewhere?
249 try:
249 try:
250 fname = filefind(self.connection_file, ['.', self.profile_dir.security_dir])
250 fname = filefind(self.connection_file, ['.', self.profile_dir.security_dir])
@@ -123,7 +123,7 b' def get_connection_file(app=None):'
123
123
124 Parameters
124 Parameters
125 ----------
125 ----------
126 app : KernelApp instance [optional]
126 app : IPKernelApp instance [optional]
127 If unspecified, the currently running app will be used
127 If unspecified, the currently running app will be used
128 """
128 """
129 if app is None:
129 if app is None:
@@ -25,7 +25,7 b' def embed_kernel(module=None, local_ns=None, **kwargs):'
25 The namespace to load into IPython user namespace (default: caller)
25 The namespace to load into IPython user namespace (default: caller)
26
26
27 kwargs : various, optional
27 kwargs : various, optional
28 Further keyword args are relayed to the KernelApp constructor,
28 Further keyword args are relayed to the IPKernelApp constructor,
29 allowing configuration of the Kernel. Will only have an effect
29 allowing configuration of the Kernel. Will only have an effect
30 on the first embed_kernel call for a given process.
30 on the first embed_kernel call for a given process.
31
31
@@ -74,7 +74,7 b' kernel_aliases.update({'
74 'transport': 'IPKernelApp.transport',
74 'transport': 'IPKernelApp.transport',
75 })
75 })
76 if sys.platform.startswith('win'):
76 if sys.platform.startswith('win'):
77 kernel_aliases['interrupt'] = 'KernelApp.interrupt'
77 kernel_aliases['interrupt'] = 'IPKernelApp.interrupt'
78
78
79 kernel_flags = dict(base_flags)
79 kernel_flags = dict(base_flags)
80 kernel_flags.update({
80 kernel_flags.update({
General Comments 0
You need to be logged in to leave comments. Login now