Issue 3122 - Add testpages.web.sitekey_frame URL handler

sitescripts/utils.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,
@@ skipping 116 matching lines @@
     raise ValueError
 
   try:
     return email.encode('ascii')
   except UnicodeEncodeError:
     return '%s@%s' % (match.group(1).encode('ascii'),
                       match.group(2).encode('idna'))
 
 _template_cache = {}
 
-def get_template(template, autoescape=True):
+def get_template(template, autoescape=True, template_path=siteScriptsPath):
   """Parses and returns a Jinja2 template"""
-  key = (template, autoescape)
+  key = (template_path, template, autoescape)
   if not key in _template_cache:
     if autoescape:
-      env = get_template_environment()
+      env = get_template_environment(template_path)
     else:
-      env = get_unescaped_template_environment()
+      env = get_unescaped_template_environment(template_path)
     _template_cache[key] = env.get_template(template)
   return _template_cache[key]
 
 @cached(float("inf"))
-def get_template_environment():
+def get_template_environment(template_path):
   """
     Returns a Jinja2 template environment with autoescaping enabled.
   """
   from sitescripts.templateFilters import filters
   import jinja2
-  env = jinja2.Environment(loader=jinja2.FileSystemLoader(siteScriptsPath), autoescape=True)
+  env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_path),
+                           autoescape=True)
   env.filters.update(filters)
   return env
 
 @cached(float("inf"))
-def get_unescaped_template_environment():
+def get_unescaped_template_environment(template_path):
   """
     Returns a Jinja2 template environment without autoescaping. Don't use this to
     generate HTML files!
   """
   from sitescripts.templateFilters import filters
   import jinja2
-  env = jinja2.Environment(loader=jinja2.FileSystemLoader(siteScriptsPath))
+  env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_path))
   env.filters.update(filters)
   return env
 
 def get_custom_template_environment(additional_filters, loader=None):
   """
     Returns a custom Jinja2 template environment with additional filters.
   """
   from sitescripts.templateFilters import filters
   import jinja2
   if not loader:
     loader = jinja2.FileSystemLoader(siteScriptsPath)
   env = jinja2.Environment(loader=loader, autoescape=True)
   env.filters.update(filters)
   env.filters.update(additional_filters)
   return env