From cf56f9937a644bb6b64fb49bccf31854f3e6689c Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 11 Oct 2022 14:49:02 +0200 Subject: [PATCH] Revert "Update layout.html to support a sphinx version that is not three-integers (#1345)" This reverts commit 45cf21874fb005ac86206ed26f609cb509eebbb2. --- sphinx_rtd_theme/__init__.py | 9 --------- sphinx_rtd_theme/layout.html | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sphinx_rtd_theme/__init__.py b/sphinx_rtd_theme/__init__.py index 9ea323f0c..f31909865 100644 --- a/sphinx_rtd_theme/__init__.py +++ b/sphinx_rtd_theme/__init__.py @@ -31,12 +31,6 @@ def config_initiated(app, config): _('The canonical_url option is deprecated, use the html_baseurl option from Sphinx instead.') ) - -def extend_html_context(app, pagename, templatename, context, doctree): - # Add ``sphinx_version_info`` tuple for use in Jinja templates - context['sphinx_version_info'] = sphinx_version - - # See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package def setup(app): if python_version[0] < 3: @@ -66,7 +60,4 @@ def setup(app): else: app.config.html_add_permalinks = "\uf0c1" - # Extend the default context when rendering the templates. - app.connect("html-page-context", extend_html_context) - return {'parallel_read_safe': True, 'parallel_write_safe': True} diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html index 99ec01b71..1d7011976 100644 --- a/sphinx_rtd_theme/layout.html +++ b/sphinx_rtd_theme/layout.html @@ -9,6 +9,10 @@ {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %} {%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' -%} +{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #} +{%- set (_ver_major, _ver_minor, _ver_bugfix) = sphinx_version.split('.') | map('int') -%} +{%- set sphinx_version_info = (_ver_major, _ver_minor, _ver_bugfix) -%} +