##// END OF EJS Templates
Merge pull request #4788 from minrk/warn-pylab-notebook...
Thomas Kluyver -
r14183:48ff4fc0 merge
parent child Browse files
Show More
@@ -527,7 +527,7 b' class NotebookApp(BaseIPythonApplication):'
527
527
528 trust_xheaders = Bool(False, config=True,
528 trust_xheaders = Bool(False, config=True,
529 help=("Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-For headers"
529 help=("Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-For headers"
530 "sent by the upstream reverse proxy. Neccesary if the proxy handles SSL")
530 "sent by the upstream reverse proxy. Necessary if the proxy handles SSL")
531 )
531 )
532
532
533 info_file = Unicode()
533 info_file = Unicode()
@@ -555,6 +555,14 b' class NotebookApp(BaseIPythonApplication):'
555 """construct the kernel arguments"""
555 """construct the kernel arguments"""
556 # Scrub frontend-specific flags
556 # Scrub frontend-specific flags
557 self.kernel_argv = swallow_argv(self.argv, notebook_aliases, notebook_flags)
557 self.kernel_argv = swallow_argv(self.argv, notebook_aliases, notebook_flags)
558 if any(arg.startswith(u'--pylab') for arg in self.kernel_argv):
559 self.log.warn('\n '.join([
560 "Starting all kernels in pylab mode is not recommended,",
561 "and will be disabled in a future release.",
562 "Please use the %matplotlib magic to enable matplotlib instead.",
563 "pylab implies many imports, which can have confusing side effects",
564 "and harm the reproducibility of your notebooks.",
565 ]))
558 # Kernel should inherit default config file from frontend
566 # Kernel should inherit default config file from frontend
559 self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name)
567 self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name)
560 # Kernel should get *absolute* path to profile directory
568 # Kernel should get *absolute* path to profile directory
General Comments 0
You need to be logged in to leave comments. Login now