IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2097 from mitya57/stable

Browse Source 
Make alabaster and sphinx_rtd_theme dependencies optional
This commit is contained in:
Takayuki SHIMIZUKAWA
2016-01-19 23:48:19 +09:00
parent 0329edc510 32591a7f77
commit dcdcdb4155
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sphinx/theming.py
+2 -3
View File
@@ -26,9 +26,6 @@ except ImportError:
from sphinx import package_dir from sphinx import package_dir
from sphinx.errors import ThemeError from sphinx.errors import ThemeError
import alabaster
import sphinx_rtd_theme
NODEFAULT = object() NODEFAULT = object()
THEMECONF = 'theme.conf' THEMECONF = 'theme.conf'
@@ -73,10 +70,12 @@ class Theme(object):
def load_extra_theme(cls, name): def load_extra_theme(cls, name):
if name in ('alabaster', 'sphinx_rtd_theme'): if name in ('alabaster', 'sphinx_rtd_theme'):
if name == 'alabaster': if name == 'alabaster':
import alabaster
themedir = alabaster.get_path() themedir = alabaster.get_path()
# alabaster theme also requires 'alabaster' extension, it will be loaded # alabaster theme also requires 'alabaster' extension, it will be loaded
# at sphinx.application module. # at sphinx.application module.
elif name == 'sphinx_rtd_theme': elif name == 'sphinx_rtd_theme':
import sphinx_rtd_theme
themedir = sphinx_rtd_theme.get_html_theme_path() themedir = sphinx_rtd_theme.get_html_theme_path()
else: else:
raise NotImplementedError('Programming Error') raise NotImplementedError('Programming Error')