From 614938479bb5ba9a07f0553aa6c9f6312e6a80a5 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Oct 2014 20:33:17 -0700 Subject: [PATCH] jinaj2 replay: use ChoiceLoader to properly load either local file system or package templates --- pywb/webapp/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pywb/webapp/views.py b/pywb/webapp/views.py index e7034050..a6250234 100644 --- a/pywb/webapp/views.py +++ b/pywb/webapp/views.py @@ -7,7 +7,8 @@ import logging from os import path from itertools import imap -from jinja2 import Environment, FileSystemLoader, PackageLoader +from jinja2 import Environment +from jinja2 import FileSystemLoader, PackageLoader, ChoiceLoader FILTERS = {} @@ -77,11 +78,10 @@ class J2TemplateView(object): self.jinja_env = self.make_jinja_env(template_dir) def make_jinja_env(self, template_dir): - if template_dir.startswith('.') or template_dir.startswith('file://'): - loader = FileSystemLoader(template_dir) - else: - loader = PackageLoader(self.env_globals['package'], template_dir) - + filesys_loader = FileSystemLoader(template_dir) + pkg_loader = PackageLoader(self.env_globals['package'], template_dir) + loader = ChoiceLoader([filesys_loader, pkg_loader]) + jinja_env = Environment(loader=loader, trim_blocks=True) jinja_env.filters.update(FILTERS) jinja_env.globals.update(self.env_globals)