Show More
@@ -165,8 +165,6 b' class IPythonConsoleApp(ConnectionFileMixin):' | |||||
165 | if argv is None: |
|
165 | if argv is None: | |
166 | argv = sys.argv[1:] |
|
166 | argv = sys.argv[1:] | |
167 | self.kernel_argv = swallow_argv(argv, self.frontend_aliases, self.frontend_flags) |
|
167 | self.kernel_argv = swallow_argv(argv, self.frontend_aliases, self.frontend_flags) | |
168 | # kernel should inherit default config file from frontend |
|
|||
169 | self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name) |
|
|||
170 |
|
168 | |||
171 | def init_connection_file(self): |
|
169 | def init_connection_file(self): | |
172 | """find the connection file, and load the info if found. |
|
170 | """find the connection file, and load the info if found. |
@@ -589,11 +589,8 b' class NotebookApp(BaseIPythonApplication):' | |||||
589 |
|
589 | |||
590 | def init_kernel_argv(self): |
|
590 | def init_kernel_argv(self): | |
591 | """construct the kernel arguments""" |
|
591 | """construct the kernel arguments""" | |
592 | self.kernel_argv = [] |
|
|||
593 | # Kernel should inherit default config file from frontend |
|
|||
594 | self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name) |
|
|||
595 | # Kernel should get *absolute* path to profile directory |
|
592 | # Kernel should get *absolute* path to profile directory | |
596 |
self.kernel_argv |
|
593 | self.kernel_argv = ["--profile-dir", self.profile_dir.location] | |
597 |
|
594 | |||
598 | def init_configurables(self): |
|
595 | def init_configurables(self): | |
599 | # force Session default to be secure |
|
596 | # force Session default to be secure |
@@ -118,16 +118,6 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,' | |||||
118 | def _config_file_name_default(self): |
|
118 | def _config_file_name_default(self): | |
119 | return 'ipython_config.py' |
|
119 | return 'ipython_config.py' | |
120 |
|
120 | |||
121 | # inherit config file name from parent: |
|
|||
122 | parent_appname = Unicode(config=True) |
|
|||
123 | def _parent_appname_changed(self, name, old, new): |
|
|||
124 | if self.config_file_specified: |
|
|||
125 | # it was manually specified, ignore |
|
|||
126 | return |
|
|||
127 | self.config_file_name = new.replace('-','_') + u'_config.py' |
|
|||
128 | # don't let this count as specifying the config file |
|
|||
129 | self.config_file_specified.remove(self.config_file_name) |
|
|||
130 |
|
||||
131 | # connection info: |
|
121 | # connection info: | |
132 |
|
122 | |||
133 | @property |
|
123 | @property |
General Comments 0
You need to be logged in to leave comments.
Login now