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

Allow to pass option to jinja env

Browse Source 
Mainly to pass cache_size=-1 while developping not to cache templates
This commit is contained in:
Matthias BUSSONNIER 2014-02-22 19:12:23 +01:00
parent 4bd315bda0
commit 816df5bb34
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IPython/html/notebookapp.py
View File

@ -134,18 +134,18 @@ class NotebookWebApplication(web.Application):
def __init__(self, ipython_app, kernel_manager, notebook_manager, def __init__(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, session_manager, log, base_url, cluster_manager, session_manager, log, base_url,
settings_overrides): settings_overrides, jinja_env_options):
settings = self.init_settings( settings = self.init_settings(
ipython_app, kernel_manager, notebook_manager, cluster_manager, ipython_app, kernel_manager, notebook_manager, cluster_manager,
session_manager, log, base_url, settings_overrides) session_manager, log, base_url, settings_overrides, jinja_env_options)
handlers = self.init_handlers(settings) handlers = self.init_handlers(settings)
super(NotebookWebApplication, self).__init__(handlers, **settings) super(NotebookWebApplication, self).__init__(handlers, **settings)
def init_settings(self, ipython_app, kernel_manager, notebook_manager, def init_settings(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, session_manager, log, base_url, cluster_manager, session_manager, log, base_url,
settings_overrides): settings_overrides, jinja_env_options=None):
# Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and # Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and
# base_url will always be unicode, which will in turn # base_url will always be unicode, which will in turn
# make the patterns unicode, and ultimately result in unicode # make the patterns unicode, and ultimately result in unicode
@ -156,6 +156,8 @@ class NotebookWebApplication(web.Application):
# and thus guaranteed to be ASCII: 'héllo' is really 'h%C3%A9llo'. # and thus guaranteed to be ASCII: 'héllo' is really 'h%C3%A9llo'.
base_url = py3compat.unicode_to_str(base_url, 'ascii') base_url = py3compat.unicode_to_str(base_url, 'ascii')
template_path = settings_overrides.get("template_path", os.path.join(os.path.dirname(__file__), "templates")) template_path = settings_overrides.get("template_path", os.path.join(os.path.dirname(__file__), "templates"))
jenv_opt = jinja_env_options if jinja_env_options else {}
env = Environment(loader=FileSystemLoader(template_path),**jenv_opt )
settings = dict( settings = dict(
# basics # basics
log_function=log_request, log_function=log_request,
@ -180,7 +182,7 @@ class NotebookWebApplication(web.Application):
nbextensions_path = ipython_app.nbextensions_path, nbextensions_path = ipython_app.nbextensions_path,
mathjax_url=ipython_app.mathjax_url, mathjax_url=ipython_app.mathjax_url,
config=ipython_app.config, config=ipython_app.config,
jinja2_env=Environment(loader=FileSystemLoader(template_path)), jinja2_env=env,
) )
# allow custom overrides for the tornado web app. # allow custom overrides for the tornado web app.
@ -398,6 +400,10 @@ class NotebookApp(BaseIPythonApplication):
help="Supply overrides for the tornado.web.Application that the " help="Supply overrides for the tornado.web.Application that the "
"IPython notebook uses.") "IPython notebook uses.")
jinja_environment_options = Dict(config=True,
help="Supply extra arguments that will be passed to Jinja environment.")
enable_mathjax = Bool(True, config=True, enable_mathjax = Bool(True, config=True,
help="""Whether to enable MathJax for typesetting math/TeX help="""Whether to enable MathJax for typesetting math/TeX
@ -578,7 +584,8 @@ class NotebookApp(BaseIPythonApplication):
self.web_app = NotebookWebApplication( self.web_app = NotebookWebApplication(
self, self.kernel_manager, self.notebook_manager, self, self.kernel_manager, self.notebook_manager,
self.cluster_manager, self.session_manager, self.cluster_manager, self.session_manager,
self.log, self.base_url, self.webapp_settings self.log, self.base_url, self.webapp_settings,
self.jinja_environment_options
) )
if self.certfile: if self.certfile:
ssl_options = dict(certfile=self.certfile) ssl_options = dict(certfile=self.certfile)

2
IPython/html/templates/page.html
View File

@ -1,5 +1,3 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>