doc_builder: remove duplication around html_theme

Author: xrmx

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

@@ -39,22 +39,15 @@ 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:
+        not 'html_style' in globals()
+    ) or 'html_theme' in globals()
+)
+if using_rtd_theme:
     import sphinx_rtd_theme
     html_theme = 'sphinx_rtd_theme'
     html_style = None
@@ -63,7 +56,6 @@ else:
         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
 
 if globals().get('websupport2_base_url', False):
     websupport2_base_url = '{{ api_host }}/websupport'