Issue 3084 - [cms] Show full tracebacks for exceptions passing template code

cms/sources.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import codecs
 import collections
 import ConfigParser
 import json
 import os
 from StringIO import StringIO
 import subprocess
 import urlparse
 import zipfile
 import logging
 
+import jinja2
+
+TEMPLATE_SUFFIX = '.tmpl'
+
+class SuffixTemplateLoader(jinja2.BaseLoader):
+  def __init__(self, loader, suffix=TEMPLATE_SUFFIX):
+    self.loader = loader
+    self.suffix = suffix
+
+  def get_source(self, environment, template):
+    return self.loader.get_source(environment, template + self.suffix)
+
 class Source:
   def resolve_link(self, url, locale):
     parsed = urlparse.urlparse(url)
     page = parsed.path
     if parsed.scheme != "" or page.startswith("/") or page.startswith("."):
       # Not a page link
       return None, None
 
     if page == "" and url != "":
       # Page-relative link
@@ skipping 141 matching lines @@
         result[key] = value["message"]
 
     return result
 
   #
   # Template helpers
   #
 
   @staticmethod
   def template_filename(template):
-    return "templates/%s.tmpl" % template
+    return "templates/%s%s" % (template, TEMPLATE_SUFFIX)
 
   def read_template(self, template):
     return self.read_file(self.template_filename(template))
 
+  def get_template_loader(self):
+    return SuffixTemplateLoader(jinja2.FunctionLoader(self.read_file))
+
   #
   # Include helpers
   #
 
   @staticmethod
   def include_filename(include, format):
     return "includes/%s.%s" % (include, format)
 
   def has_include(self, include, format):
     return self.has_file(self.include_filename(include, format))
@@ skipping 82 matching lines @@
         path = os.path.join(dir, filename)
         if os.path.isfile(path):
           result.append(relpath + filename)
         elif os.path.isdir(path):
           do_list(path, relpath + filename + "/")
     do_list(self.get_path(subdir), "")
     return result
 
   def get_cache_dir(self):
     return os.path.join(self._dir, "cache")
+
+  def get_template_loader(self):
+    return SuffixTemplateLoader(jinja2.FileSystemLoader(self._dir))

[Sebastian Noack, 2015/09/15 17:48:36]

We need a loader that is aware of the filename for templates loaded via {%
include %} and {% import %}. Theoretically we could also use
Environment.get_template() now, but this doesn't seem to workout with the
architecture of the CMS .