Georg Brandl avatar Georg Brandl committed 36ef1c5

#39: spurious <generator ...> was emitted in HTML output. This is due to a
Jinja bug; the workaround is to just not use empty {% block %} tags.

Comments (0)

Files changed (3)

 Bugs fixed
 ----------
 
+* Work around a bug in Jinja that caused "<generator ...>" to be
+  emitted in HTML output.
+
 * Fix a problem with module links not being generated in LaTeX output.
 
 * Fix the handling of images in different directories.

sphinx/templates/layout.html

         {%- for parent in parents %}
           <li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a>{{ reldelim1 }}</li>
         {%- endfor %}
-        {%- block relbaritems %}{% endblock %}
+        {%- block relbaritems %} {% endblock %}
       </ul>
     </div>
 {%- endmacro %}
     <link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" />
     {%- endif %}
 {%- endblock %}
-{%- block extrahead %}{% endblock %}
+{%- block extrahead %} {% endblock %}
   </head>
   <body>
 
 {%- block relbar1 %}{{ relbar() }}{% endblock %}
 
-{%- block sidebar1 %}{# possible location for sidebar #}{% endblock %}
+{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
 
 {%- block document %}
     <div class="document">
         <div class="bodywrapper">
       {%- endif %}
           <div class="body">
-            {% block body %}{% endblock %}
+            {% block body %} {% endblock %}
           </div>
       {%- if builder != 'htmlhelp' %}
         </div>

sphinx/templates/opensearch.xml

   <Url type="text/html" method="get"
        template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}&amp;check_keywords=yes&amp;area=default"/>
   <LongName>{{ docstitle }}</LongName>
-{% block extra %}{# Put e.g. an <Image> element here. #}{% endblock %}
+{% block extra %} {# Put e.g. an <Image> element here. #} {% endblock %}
 </OpenSearchDescription>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.