Merge pull request #4278 from italia/extendconfpyctx

make it easier to use a different default theme

Author: ericholscher

readthedocs/doc_builder/backends/sphinx.py

@@ -108,6 +108,8 @@ def get_config_params(self):
             downloads = api.version(self.version.pk).get()['downloads']
 
         data = {
+            'html_theme': 'sphinx_rtd_theme',
+            'html_theme_import': 'sphinx_rtd_theme',
             'current_version': self.version.verbose_name,
             'project': self.project,
             'version': self.version,

readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl

@@ -14,6 +14,7 @@
 #
 
 
+import importlib
 import sys
 import os.path
 from six import string_types
@@ -39,31 +40,23 @@ if os.path.exists('_static'):
 html_static_path.append('{{ static_path }}')
 
 # Add RTD Theme only if they aren't overriding it already
-using_rtd_theme = False
-if 'html_theme' in globals():
-    if html_theme in ['default']:
+using_rtd_theme = (
+    (
+        'html_theme' in globals() and
+        html_theme in ['default'] and
         # Allow people to bail with a hack of having an html_style
-        if not 'html_style' in globals():
-            import sphinx_rtd_theme
-            html_theme = 'sphinx_rtd_theme'
-            html_style = None
-            html_theme_options = {}
-            if 'html_theme_path' in globals():
-                html_theme_path.append(sphinx_rtd_theme.get_html_theme_path())
-            else:
-                html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-            using_rtd_theme = True
-else:
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
+        'html_style' not in globals()
+    ) or 'html_theme' not in globals()
+)
+if using_rtd_theme:
+    theme = importlib.import_module('{{ html_theme_import }}')
+    html_theme = '{{ html_theme }}'
     html_style = None
     html_theme_options = {}
     if 'html_theme_path' in globals():
-        html_theme_path.append(sphinx_rtd_theme.get_html_theme_path())
+        html_theme_path.append(theme.get_html_theme_path())
     else:
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    using_rtd_theme = True
+        html_theme_path = [theme.get_html_theme_path()]
 
 if globals().get('websupport2_base_url', False):
     websupport2_base_url = '{{ api_host }}/websupport'