From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 30 Dec 2011 20:42:15 +0000 (-0500)
Subject: implement jinja2 fallback for .js, .css files, [ticket:2359]
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6de13a13196c58831486a51a2748bb4105106bd2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

implement jinja2 fallback for .js, .css files, [ticket:2359]
---

diff --git a/doc/build/builder/builders.py b/doc/build/builder/builders.py
index 1941618af9..1410270ec6 100644
--- a/doc/build/builder/builders.py
+++ b/doc/build/builder/builders.py
@@ -1,6 +1,7 @@
 from sphinx.application import TemplateBridge
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.highlighting import PygmentsBridge
+from sphinx.jinja2glue import BuiltinTemplateLoader
 from pygments import highlight
 from pygments.lexer import RegexLexer, bygroups, using
 from pygments.token import *
@@ -13,6 +14,8 @@ from mako.template import Template
 
 class MakoBridge(TemplateBridge):
     def init(self, builder, *args, **kw):
+        self.jinja2_fallback = BuiltinTemplateLoader()
+        self.jinja2_fallback.init(builder, *args, **kw)
         self.layout = builder.config.html_context.get('mako_layout', 'html')
         builder.config.html_context['release_date'] = builder.config['release_date']
         builder.config.html_context['versions'] = builder.config['versions']
@@ -34,17 +37,9 @@ class MakoBridge(TemplateBridge):
 
 
     def render_string(self, template, context):
-        context['prevtopic'] = context.pop('prev', None)
-        context['nexttopic'] = context.pop('next', None)
-        context['mako_layout'] = self.layout == 'html' and 'static_base.mako' or 'site_base.mako'
-        # sphinx 1.0b2 doesn't seem to be providing _ for some reason...
-        context.setdefault('_', lambda x:x)
-        return Template(template, lookup=self.lookup,
-            format_exceptions=True, 
-            imports=[
-                "from builder import util"
-            ]
-        ).render_unicode(**context)
+        # this is used for  .js, .css etc. and we don't have
+        # local copies of that stuff here so use the jinja render.
+        return self.jinja2_fallback.render_string(template, context)
 
 class StripDocTestFilter(Filter):
     def filter(self, lexer, stream):