1. wilsaj
  2. sqlalchemy


Mike Bayer  committed 8112267

add a "jinja2 fallback" renderer for render_string(), which is used for the js/css templates
we don't really care about. not sure if this is going to break again with a newer sphinx
or what, but fixes [ticket:2359] for now.

  • Participants
  • Parent commits b925399
  • Branches rel_0_6

Comments (0)

Files changed (1)

File doc/build/builder/builders.py

View file
  • Ignore whitespace
 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 *
 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']
         context.setdefault('_', lambda x:x)
         return self.lookup.get_template(template).render_unicode(**context)
     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):