Fixed custom jinja2 templates being ignored when setting template_path

[mlhenderson]

IPython/html/notebookapp.py was ignoring user specified templates by setting the jinja2 environment to the default template directory before updating template_path. This fix allows a user defined template_path to propagate to the jinja2 environment.

[Carreau]

Shouldn't that be above settings_override ?

[mlhenderson]

The problem is that having the Environment initialized before
settings_overrides is applied means that any custom template_path setting
is ignored. The template_path used in the original code will always be the
default, regardless of what you set template_path to. This keeps
everything in the settings dict, but allows for the user to override
template_path when the jinja2 environment is created.

On Thu, Aug 15, 2013 at 4:08 AM, Matthias Bussonnier <
notifications@github.com> wrote:

In IPython/html/notebookapp.py:

     )

     # allow custom overrides for the tornado web app.
     settings.update(settings_overrides)

•    # create a jinja2 environment using the template path and store it in settings
  

•    settings["jinja2_env"]=Environment(loader=FileSystemLoader(settings["template_path"]))
  

Shouldn't that be above settings_override ?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4035/files#r5787706
.

[Carreau]

ah yes,...but then settings["jinja2_env"] cannot be overridden.
I'm too tired to find the right logic, but is should be possible wit a condition to deal with each cases ... will sleep on it.

[minrk]

All you should need to change is the initial assignment of template_path:

template_path = settings_overrides.get('template_path', os.path.join(os.path.dirname(__file__), "templates"))

[mlhenderson]

Yeah, that's a good approach. I've updated accordingly.

On Thu, Aug 15, 2013 at 3:46 PM, Min RK notifications@github.com wrote:

In IPython/html/notebookapp.py:

     )

     # allow custom overrides for the tornado web app.
     settings.update(settings_overrides)

•    # create a jinja2 environment using the template path and store it in settings
  

•    settings["jinja2_env"]=Environment(loader=FileSystemLoader(settings["template_path"]))
  

All you should need to change is the initial assignment of template_path:

template_path = settings_overrides.get('template_path', os.path.join(os.path.dirname(file), "templates"))

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4035/files#r5803867
.

[minrk]

minor nitpick, but can you avoid removing this comma?

[mlhenderson]

Done, but in my defense technically I was making the IPython Notebook more
efficient...

On Thu, Aug 15, 2013 at 4:42 PM, Min RK notifications@github.com wrote:

In IPython/html/notebookapp.py:

@@ -173,7 +173,7 @@ def init_settings(self, ipython_app, kernel_manager, notebook_manager,
mathjax_url=ipython_app.mathjax_url,
config=ipython_app.config,
use_less=ipython_app.use_less,

•        jinja2_env=Environment(loader=FileSystemLoader(template_path)),
  

•        jinja2_env=Environment(loader=FileSystemLoader(template_path))
  

minor nitpick, but can you avoid removing this comma?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4035/files#r5804840
.

[minrk]

thanks, merging.